Catch xml import error for composition

qgis · Sep 28, 2012 · f2f1426 · f2f1426
1 parent 3a1c9ef
commit f2f1426
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -379,7 +379,13 @@ bool QgsComposition::loadFromTemplate( const QDomDocument& doc, QMap<QString, QS
     {
       xmlString = xmlString.replace( "[" + sIt.key() + "]", encodeStringForXML( sIt.value() ) );
     }
-    importDoc.setContent( xmlString );
+
+    QString errorMsg;
+    int errorLine, errorColumn;
+    if ( !importDoc.setContent( xmlString, &errorMsg, &errorLine, &errorColumn ) )
+    {
+      return false;
+    }
   }
   else
   {