Fix regression in vector "save as" that saved shapefiles as .dbf only (…

…fixes #14158)
qgis · Jan 23, 2016 · 5512d54 · 5512d54 · nirvn · Jan 23, 2016
1 parent 8346601
commit 5512d54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.cpp b/src/app/ogr/qgsvectorlayersaveasdialog.cpp
@@ -395,21 +395,24 @@ QStringList QgsVectorLayerSaveAsDialog::layerOptions() const
         case QgsVectorFileWriter::Int:
         {
           QSpinBox* sb = mLayerOptionsGroupBox->findChild<QSpinBox*>( it.key() );
-          options << QString( "%1=%2" ).arg( it.key() ).arg( sb->value() );
+          if ( sb )
+            options << QString( "%1=%2" ).arg( it.key() ).arg( sb->value() );
           break;
         }
 
         case QgsVectorFileWriter::Set:
         {
           QComboBox* cb = mLayerOptionsGroupBox->findChild<QComboBox*>( it.key() );
-          options << QString( "%1=%2" ).arg( it.key(), cb->currentText() );
+          if ( cb && !cb->itemData( cb->currentIndex() ).isNull() )
+            options << QString( "%1=%2" ).arg( it.key(), cb->currentText() );
           break;
         }
 
         case QgsVectorFileWriter::String:
         {
           QLineEdit* le = mLayerOptionsGroupBox->findChild<QLineEdit*>( it.key() );
-          options << QString( "%1=%2" ).arg( it.key(), le->text() );
+          if ( le )
+            options << QString( "%1=%2" ).arg( it.key(), le->text() );
           break;
         }
 

diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -683,7 +683,8 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
                          << "ARCZ"
                          << "POLYGONZ"
                          << "MULTIPOINTZ",
-                         "NULL" // Default value
+                         QString(), // Default value
+                         true  // Allow None
                        ) );
 
   layerOptions.insert( "ENCODING", new SetOption(