vector layer: ignore non-existing fields in min/max/uniqueValues (fixes #13194)

jef-n · jef-n · commit c7b1080f4635 · 2015-08-10T20:05:18.000+02:00
(cherry picked from commit 71e7aab)
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2928,6 +2928,10 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int
   }
 
   QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin( index );
+  if ( origin == QgsFields::OriginUnknown )
+  {
+    return;
+  }
 
   if ( origin == QgsFields::OriginProvider ) //a provider field
   {
@@ -3018,6 +3022,10 @@ QVariant QgsVectorLayer::minimumValue( int index )
   }
 
   QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin( index );
+  if ( origin == QgsFields::OriginUnknown )
+  {
+    return QVariant();
+  }
 
   if ( origin == QgsFields::OriginProvider ) //a provider field
   {
@@ -3080,6 +3088,10 @@ QVariant QgsVectorLayer::maximumValue( int index )
   }
 
   QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin( index );
+  if ( origin == QgsFields::OriginUnknown )
+  {
+    return QVariant();
+  }
 
   if ( origin == QgsFields::OriginProvider ) //a provider field
   {

Original file line number	Diff line number	Diff line change
`@@ -2928,6 +2928,10 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int`
`2928`	`2928`	`}`
`2929`	`2929`
`2930`	`2930`	`QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin( index );`
	`2931`	`+ if ( origin == QgsFields::OriginUnknown )`
	`2932`	`+ {`
	`2933`	`+ return;`
	`2934`	`+ }`
`2931`	`2935`
`2932`	`2936`	`if ( origin == QgsFields::OriginProvider ) //a provider field`
`2933`	`2937`	`{`
`@@ -3018,6 +3022,10 @@ QVariant QgsVectorLayer::minimumValue( int index )`
`3018`	`3022`	`}`
`3019`	`3023`
`3020`	`3024`	`QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin( index );`
	`3025`	`+ if ( origin == QgsFields::OriginUnknown )`
	`3026`	`+ {`
	`3027`	`+ return QVariant();`
	`3028`	`+ }`
`3021`	`3029`
`3022`	`3030`	`if ( origin == QgsFields::OriginProvider ) //a provider field`
`3023`	`3031`	`{`
`@@ -3080,6 +3088,10 @@ QVariant QgsVectorLayer::maximumValue( int index )`
`3080`	`3088`	`}`
`3081`	`3089`
`3082`	`3090`	`QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin( index );`
	`3091`	`+ if ( origin == QgsFields::OriginUnknown )`
	`3092`	`+ {`
	`3093`	`+ return QVariant();`
	`3094`	`+ }`
`3083`	`3095`
`3084`	`3096`	`if ( origin == QgsFields::OriginProvider ) //a provider field`
`3085`	`3097`	`{`