fix #1564

jef · jef · commit 4fe08d04e0f3 · 2009-03-05T15:03:31.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10263 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -512,15 +512,16 @@ void QgsVectorLayerProperties::apply()
     QgsVectorLayer::EditType editType = ( QgsVectorLayer::EditType ) cb->itemData( cb->currentIndex() ).toInt();
     layer->setEditType( idx, editType );
 
+    QString value = tblAttributes->item( i, 7 ) ? tblAttributes->item( i, 7 )->text() : QString::null;
+
     if ( editType == QgsVectorLayer::ValueMap )
     {
       QMap<QString, QVariant> &map = layer->valueMap( idx );
       map.clear();
 
-      QString value = tblAttributes->item( i, 7 )->text();
       if ( !value.isEmpty() )
       {
-        QStringList values = tblAttributes->item( i, 7 )->text().split( ";" );
+        QStringList values = value.split( ";" );
         for ( int j = 0; j < values.size(); j++ )
         {
           QStringList args = values[j].split( "=" );
@@ -548,7 +549,7 @@ void QgsVectorLayerProperties::apply()
     else if ( editType == QgsVectorLayer::EditRange ||
               editType == QgsVectorLayer::SliderRange )
     {
-      QStringList values = tblAttributes->item( i, 7 )->text().split( ";" );
+      QStringList values = value.split( ";" );
 
       if ( values.size() == 3 )
       {

Original file line number	Diff line number	Diff line change
`@@ -512,15 +512,16 @@ void QgsVectorLayerProperties::apply()`
`512`	`512`	`QgsVectorLayer::EditType editType = ( QgsVectorLayer::EditType ) cb->itemData( cb->currentIndex() ).toInt();`
`513`	`513`	`layer->setEditType( idx, editType );`
`514`	`514`
	`515`	`+ QString value = tblAttributes->item( i, 7 ) ? tblAttributes->item( i, 7 )->text() : QString::null;`
	`516`	`+`
`515`	`517`	`if ( editType == QgsVectorLayer::ValueMap )`
`516`	`518`	`{`
`517`	`519`	`QMap<QString, QVariant> &map = layer->valueMap( idx );`
`518`	`520`	`map.clear();`
`519`	`521`
`520`		`- QString value = tblAttributes->item( i, 7 )->text();`
`521`	`522`	`if ( !value.isEmpty() )`
`522`	`523`	`{`
`523`		`- QStringList values = tblAttributes->item( i, 7 )->text().split( ";" );`
	`524`	`+ QStringList values = value.split( ";" );`
`524`	`525`	`for ( int j = 0; j < values.size(); j++ )`
`525`	`526`	`{`
`526`	`527`	`QStringList args = values[j].split( "=" );`
`@@ -548,7 +549,7 @@ void QgsVectorLayerProperties::apply()`
`548`	`549`	`else if ( editType == QgsVectorLayer::EditRange \|\|`
`549`	`550`	`editType == QgsVectorLayer::SliderRange )`
`550`	`551`	`{`
`551`		`- QStringList values = tblAttributes->item( i, 7 )->text().split( ";" );`
	`552`	`+ QStringList values = value.split( ";" );`
`552`	`553`
`553`	`554`	`if ( values.size() == 3 )`
`554`	`555`	`{`