[QGIS Commit] r15287 - trunk/qgis/src/app

svn_qgis at osgeo.org svn_qgis at osgeo.org
Mon Feb 28 14:49:32 EST 2011


Author: jef
Date: 2011-02-28 11:49:32 -0800 (Mon, 28 Feb 2011)
New Revision: 15287

Modified:
   trunk/qgis/src/app/qgsattributetypedialog.cpp
Log:
fix #3534

Modified: trunk/qgis/src/app/qgsattributetypedialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsattributetypedialog.cpp	2011-02-28 19:14:57 UTC (rev 15286)
+++ trunk/qgis/src/app/qgsattributetypedialog.cpp	2011-02-28 19:49:32 UTC (rev 15287)
@@ -542,13 +542,19 @@
       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;



More information about the QGIS-commit mailing list