Fix for problem where paper settings in composer have not been restor…

…ed properly git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11960 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 7, 2009 · 7e8124d · 7e8124d
1 parent 22d95aa
commit 7e8124d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -1079,8 +1079,14 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
   mView = new QgsComposerView( mViewFrame );
   connectSlots();
 
+  //read composition settings
   mComposition = new QgsComposition( mQgis->mapCanvas()->mapRenderer() );
-  mComposition->readXML( composerElem, doc );
+  QDomNodeList compositionNodeList = composerElem.elementsByTagName( "Composition" );
+  if ( compositionNodeList.size() > 0 )
+  {
+    QDomElement compositionElem = compositionNodeList.at( 0 ).toElement();
+    mComposition->readXML( compositionElem, doc );
+  }
 
   QGridLayout *l = new QGridLayout( mViewFrame );
   l->setMargin( 0 );