Skip to content

Commit

Permalink
Fix #4495 - patch by Nathan
Browse files Browse the repository at this point in the history
  • Loading branch information
wonder-sk committed Nov 4, 2011
1 parent eea7460 commit eb48501
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/app/qgslabelinggui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 0 additions & 2 deletions src/core/qgspallabeling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -786,8 +786,6 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices,
attrIndices.insert( fldIndex );
}

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

0 comments on commit eb48501

Please sign in to comment.