[QGIS Commit] r11960 - trunk/qgis/src/app/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-11-07 11:50:40 -0500 (Sat, 07 Nov 2009)
New Revision: 11960

Modified:
   trunk/qgis/src/app/composer/qgscomposer.cpp
Log:
Fix for problem where paper settings in composer have not been restored properly

Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp	2009-11-07 16:39:02 UTC (rev 11959)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp	2009-11-07 16:50:40 UTC (rev 11960)
@@ -1079,8 +1079,14 @@
   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 );