fix #3534

jef · jef · commit 842d19d676b2 · 2011-02-28T19:49:32.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15287 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp
@@ -542,13 +542,19 @@ void QgsAttributeTypeDialog::accept()
       mValueMap.clear();
       for ( int i = 0; i < tableWidget->rowCount() - 1; i++ )
       {
-        if ( tableWidget->item( i, 1 )->text().isNull() )
+        QTableWidgetItem *ki = tableWidget->item( i, 0 );
+        QTableWidgetItem *vi = tableWidget->item( i, 1 );
+
+        if ( !ki )
+          continue;
+
+        if ( !vi || vi->text().isNull() )
         {
-          mValueMap.insert( tableWidget->item( i, 0 )->text(), tableWidget->item( i, 0 )->text() );
+          mValueMap.insert( ki->text(), ki->text() );
         }
         else
         {
-          mValueMap.insert( tableWidget->item( i, 1 )->text(), tableWidget->item( i, 0 )->text() );
+          mValueMap.insert( vi->text(), ki->text() );
         }
       }
       mEditType = QgsVectorLayer::ValueMap;

Original file line number	Diff line number	Diff line change
`@@ -542,13 +542,19 @@ void QgsAttributeTypeDialog::accept()`
`542`	`542`	`mValueMap.clear();`
`543`	`543`	`for ( int i = 0; i < tableWidget->rowCount() - 1; i++ )`
`544`	`544`	`{`
`545`		`- if ( tableWidget->item( i, 1 )->text().isNull() )`
	`545`	`+ QTableWidgetItem *ki = tableWidget->item( i, 0 );`
	`546`	`+ QTableWidgetItem *vi = tableWidget->item( i, 1 );`
	`547`	`+`
	`548`	`+ if ( !ki )`
	`549`	`+ continue;`
	`550`	`+`
	`551`	`+ if ( !vi \|\| vi->text().isNull() )`
`546`	`552`	`{`
`547`		`- mValueMap.insert( tableWidget->item( i, 0 )->text(), tableWidget->item( i, 0 )->text() );`
	`553`	`+ mValueMap.insert( ki->text(), ki->text() );`
`548`	`554`	`}`
`549`	`555`	`else`
`550`	`556`	`{`
`551`		`- mValueMap.insert( tableWidget->item( i, 1 )->text(), tableWidget->item( i, 0 )->text() );`
	`557`	`+ mValueMap.insert( vi->text(), ki->text() );`
`552`	`558`	`}`
`553`	`559`	`}`
`554`	`560`	`mEditType = QgsVectorLayer::ValueMap;`