expression builder: only fetch geometry when required (and available)

jef-n · jef-n · commit 407832a9c72f · 2012-03-06T13:53:26.000+01:00
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -249,7 +249,7 @@ void QgsExpressionBuilderWidget::on_txtExpressionString_textChanged()
   {
     if ( !mFeature.isValid() )
     {
-      mLayer->select( mLayer->pendingAllAttributesList() );
+      mLayer->select( mLayer->pendingAllAttributesList(), QgsRectangle(), mLayer->geometryType() != QGis::NoGeometry && exp.needsGeometry() );
       mLayer->nextFeature( mFeature );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ void QgsExpressionBuilderWidget::on_txtExpressionString_textChanged()`
`249`	`249`	`{`
`250`	`250`	`if ( !mFeature.isValid() )`
`251`	`251`	`{`
`252`		`- mLayer->select( mLayer->pendingAllAttributesList() );`
	`252`	`+ mLayer->select( mLayer->pendingAllAttributesList(), QgsRectangle(), mLayer->geometryType() != QGis::NoGeometry && exp.needsGeometry() );`
`253`	`253`	`mLayer->nextFeature( mFeature );`
`254`	`254`	`}`
`255`	`255`