fix old labeling (fixes #8030)

jef-n · jef-n · commit 42d57d6f8f5b · 2013-07-11T01:19:39.000+02:00
diff --git a/src/core/qgslabel.cpp b/src/core/qgslabel.cpp
@@ -65,12 +65,8 @@ QgsLabel::~QgsLabel()
 
 QString QgsLabel::fieldValue( int attr, QgsFeature &feature )
 {
-  if ( mLabelFieldIdx[attr] == -1 )
-  {
-    return QString();
-  }
-
-  return feature.attribute( attr ).toString();
+  int idx = mLabelFieldIdx[attr];
+  return idx < 0 ? QString() : feature.attribute( idx ).toString();
 }
 
 void QgsLabel::renderLabel( QgsRenderContext &renderContext,

Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,8 @@ QgsLabel::~QgsLabel()`
`65`	`65`
`66`	`66`	`QString QgsLabel::fieldValue( int attr, QgsFeature &feature )`
`67`	`67`	`{`
`68`		`- if ( mLabelFieldIdx[attr] == -1 )`
`69`		`- {`
`70`		`- return QString();`
`71`		`- }`
`72`		`-`
`73`		`- return feature.attribute( attr ).toString();`
	`68`	`+ int idx = mLabelFieldIdx[attr];`
	`69`	`+ return idx < 0 ? QString() : feature.attribute( idx ).toString();`
`74`	`70`	`}`
`75`	`71`
`76`	`72`	`void QgsLabel::renderLabel( QgsRenderContext &renderContext,`