Fix #4495 - patch by Nathan

qgis · Nov 4, 2011 · eb48501 · eb48501
1 parent eea7460
commit eb48501
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
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
   {