Fix for #854 - Dont assert for unknown types in QgsVectorFileWriter

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7742 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 7, 2007 · f07f41b · f07f41b
1 parent 2bacc50
commit f07f41b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/app/legend/qgslegendlayerfile.cpp b/src/app/legend/qgslegendlayerfile.cpp
@@ -405,6 +405,10 @@ void QgsLegendLayerFile::saveAsShapefileGeneral(bool saveOnlySelection)
     case QgsVectorFileWriter::ErrCreateLayer:
       QMessageBox::warning(0, tr("Error"), tr("Layer creation failed"));
       break;
+    case QgsVectorFileWriter::ErrAttributeTypeUnsupported:
+      QMessageBox::warning(0, tr("Error"), 
+          tr("Layer attribute table contains unsupported datatype(s)"));
+      break;
   }
 }
 

diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -122,7 +122,9 @@ QgsVectorFileWriter::QgsVectorFileWriter(const QString& shapefileName,
         ogrType = OFTReal;
         break;
       default:
-        assert(0 && "invalid variant type!");
+        //assert(0 && "invalid variant type!");
+        mError = ErrAttributeTypeUnsupported;
+        return;
     }
 
     // create field definition
@@ -220,7 +222,8 @@ bool QgsVectorFileWriter::addFeature(QgsFeature& feature)
         poFeature->SetField(encAttrName.data(), mCodec->fromUnicode(attrValue.toString()).data());
         break;
       default:
-        assert(0 && "invalid variant type");
+        //assert(0 && "invalid variant type");
+        return false;
     }
   }
 

diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
@@ -47,7 +47,8 @@ class CORE_EXPORT QgsVectorFileWriter
       NoError = 0,
       ErrDriverNotFound,
       ErrCreateDataSource,
-      ErrCreateLayer
+      ErrCreateLayer,
+      ErrAttributeTypeUnsupported
     };
 
     /** Write contents of vector layer to a shapefile */