Skip to content
Permalink
Browse files

Fix #4495 - patch by Nathan

  • Loading branch information
wonder-sk committed Nov 4, 2011
1 parent eea7460 commit eb48501478a60aacf56d2e9ee7917ee1ee1cda79
Showing with 0 additions and 3 deletions.
  1. +0 −1 src/app/qgslabelinggui.cpp
  2. +0 −2 src/core/qgspallabeling.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 )
@@ -786,8 +786,6 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices,
attrIndices.insert( fldIndex );
}

if ( fldIndex == -1 )
return 0;
}
else
{

0 comments on commit eb48501

Please sign in to comment.
You can’t perform that action at this time.