Fix #4495 - patch by Nathan

wonder-sk · wonder-sk · commit eb48501478a6 · 2011-11-04T11:06:50.000-03:00
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -492,7 +492,6 @@ void QgsLabelingGui::showEngineConfigDialog()
 
 void QgsLabelingGui::showExpressionDialog()
 {
-  //TODO extract this out to a dialog.
   QgsExpressionBuilderDialog dlg( mLayer, cboFieldName->currentText() , this );
   dlg.setWindowTitle( tr( "Expression based label" ) );
   if ( dlg.exec() == QDialog::Accepted )
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -786,8 +786,6 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices,
       attrIndices.insert( fldIndex );
     }
 
-    if ( fldIndex == -1 )
-      return 0;
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,6 @@ void QgsLabelingGui::showEngineConfigDialog()`
`492`	`492`
`493`	`493`	`void QgsLabelingGui::showExpressionDialog()`
`494`	`494`	`{`
`495`		`- //TODO extract this out to a dialog.`
`496`	`495`	`QgsExpressionBuilderDialog dlg( mLayer, cboFieldName->currentText() , this );`
`497`	`496`	`dlg.setWindowTitle( tr( "Expression based label" ) );`
`498`	`497`	`if ( dlg.exec() == QDialog::Accepted )`
Original file line number	Diff line number	Diff line change
`@@ -786,8 +786,6 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices,`
`786`	`786`	`attrIndices.insert( fldIndex );`
`787`	`787`	`}`
`788`	`788`
`789`		`- if ( fldIndex == -1 )`
`790`		`- return 0;`
`791`	`789`	`}`
`792`	`790`	`else`
`793`	`791`	`{`