fix NULL support in attribute editor

jef · jef · commit 2b71f62c58b3 · 2011-01-19T14:25:52.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15057 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp
@@ -558,7 +558,7 @@ bool QgsAttributeEditor::retrieveValue( QWidget *widget, QgsVectorLayer *vl, int
       }
       else if ( modified )
       {
-        value = QVariant( theField.type() );
+        value = QVariant();
       }
     }
     break;
@@ -573,7 +573,7 @@ bool QgsAttributeEditor::retrieveValue( QWidget *widget, QgsVectorLayer *vl, int
       }
       else if ( modified )
       {
-        value = QVariant( theField.type() );
+        value = QVariant();
       }
     }
     case QVariant::Double:
@@ -587,7 +587,7 @@ bool QgsAttributeEditor::retrieveValue( QWidget *widget, QgsVectorLayer *vl, int
       }
       else if ( modified )
       {
-        value = QVariant( theField.type() );
+        value = QVariant();
       }
     }
     break;
@@ -601,7 +601,7 @@ bool QgsAttributeEditor::retrieveValue( QWidget *widget, QgsVectorLayer *vl, int
       }
       else if ( modified )
       {
-        value = QVariant( theField.type() );
+        value = QVariant();
       }
     }
     break;

Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ bool QgsAttributeEditor::retrieveValue( QWidget widget, QgsVectorLayer vl, int`
`558`	`558`	`}`
`559`	`559`	`else if ( modified )`
`560`	`560`	`{`
`561`		`- value = QVariant( theField.type() );`
	`561`	`+ value = QVariant();`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`	`break;`
`@@ -573,7 +573,7 @@ bool QgsAttributeEditor::retrieveValue( QWidget widget, QgsVectorLayer vl, int`
`573`	`573`	`}`
`574`	`574`	`else if ( modified )`
`575`	`575`	`{`
`576`		`- value = QVariant( theField.type() );`
	`576`	`+ value = QVariant();`
`577`	`577`	`}`
`578`	`578`	`}`
`579`	`579`	`case QVariant::Double:`
`@@ -587,7 +587,7 @@ bool QgsAttributeEditor::retrieveValue( QWidget widget, QgsVectorLayer vl, int`
`587`	`587`	`}`
`588`	`588`	`else if ( modified )`
`589`	`589`	`{`
`590`		`- value = QVariant( theField.type() );`
	`590`	`+ value = QVariant();`
`591`	`591`	`}`
`592`	`592`	`}`
`593`	`593`	`break;`
`@@ -601,7 +601,7 @@ bool QgsAttributeEditor::retrieveValue( QWidget widget, QgsVectorLayer vl, int`
`601`	`601`	`}`
`602`	`602`	`else if ( modified )`
`603`	`603`	`{`
`604`		`- value = QVariant( theField.type() );`
	`604`	`+ value = QVariant();`
`605`	`605`	`}`
`606`	`606`	`}`
`607`	`607`	`break;`