From f2f14264c919d60252c3ca60d239faf3b762b85e Mon Sep 17 00:00:00 2001
From: Marco Hugentobler <marco.hugentobler@sourcepole.ch>
Date: Thu, 27 Sep 2012 21:21:05 +0200
Subject: [PATCH] Catch xml import error for composition

---
 src/core/composer/qgscomposition.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
index c7ea166dad4..651b7924094 100644
--- 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
   {