Catch xml import error for composition

mhugent · mhugent · commit f2f14264c919 · 2012-09-28T12:25:25.000+02:00
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
   {

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,13 @@ bool QgsComposition::loadFromTemplate( const QDomDocument& doc, QMap<QString, QS`
`379`	`379`	`{`
`380`	`380`	`xmlString = xmlString.replace( "[" + sIt.key() + "]", encodeStringForXML( sIt.value() ) );`
`381`	`381`	`}`
`382`		`- importDoc.setContent( xmlString );`
	`382`	`+`
	`383`	`+ QString errorMsg;`
	`384`	`+ int errorLine, errorColumn;`
	`385`	`+ if ( !importDoc.setContent( xmlString, &errorMsg, &errorLine, &errorColumn ) )`
	`386`	`+ {`
	`387`	`+ return false;`
	`388`	`+ }`
`383`	`389`	`}`
`384`	`390`	`else`
`385`	`391`	`{`