Fix restoration of compositions from legacy projects

nyalldawson · nyalldawson · commit c9b87387fa9e · 2017-03-21T10:32:53.000+10:00
diff --git a/src/core/composer/qgslayoutmanager.cpp b/src/core/composer/qgslayoutmanager.cpp
@@ -102,19 +102,25 @@ bool QgsLayoutManager::readXml( const QDomElement &element, const QDomDocument &
     layoutsElem = element.firstChildElement( QStringLiteral( "Layouts" ) );
   }
   if ( layoutsElem.isNull() )
-    return false;
+  {
+    // handle legacy projects
+    layoutsElem = doc.documentElement();
+  }
 
   //restore each composer
   bool result = true;
   QDomNodeList composerNodes = element.elementsByTagName( QStringLiteral( "Composer" ) );
   for ( int i = 0; i < composerNodes.size(); ++i )
   {
+    QString legacyTitle = composerNodes.at( i ).toElement().attribute( QStringLiteral( "title" ) );
     QgsComposition *c = createCompositionFromXml( composerNodes.at( i ).toElement(), doc );
     if ( !c )
     {
       result = false;
       continue;
     }
+    if ( c->name().isEmpty() )
+      c->setName( legacyTitle );
     result = result && addComposition( c );
   }
   return result;

Original file line number	Diff line number	Diff line change
`@@ -102,19 +102,25 @@ bool QgsLayoutManager::readXml( const QDomElement &element, const QDomDocument &`
`102`	`102`	`layoutsElem = element.firstChildElement( QStringLiteral( "Layouts" ) );`
`103`	`103`	`}`
`104`	`104`	`if ( layoutsElem.isNull() )`
`105`		`- return false;`
	`105`	`+ {`
	`106`	`+ // handle legacy projects`
	`107`	`+ layoutsElem = doc.documentElement();`
	`108`	`+ }`
`106`	`109`
`107`	`110`	`//restore each composer`
`108`	`111`	`bool result = true;`
`109`	`112`	`QDomNodeList composerNodes = element.elementsByTagName( QStringLiteral( "Composer" ) );`
`110`	`113`	`for ( int i = 0; i < composerNodes.size(); ++i )`
`111`	`114`	`{`
	`115`	`+ QString legacyTitle = composerNodes.at( i ).toElement().attribute( QStringLiteral( "title" ) );`
`112`	`116`	`QgsComposition *c = createCompositionFromXml( composerNodes.at( i ).toElement(), doc );`
`113`	`117`	`if ( !c )`
`114`	`118`	`{`
`115`	`119`	`result = false;`
`116`	`120`	`continue;`
`117`	`121`	`}`
	`122`	`+ if ( c->name().isEmpty() )`
	`123`	`+ c->setName( legacyTitle );`
`118`	`124`	`result = result && addComposition( c );`
`119`	`125`	`}`
`120`	`126`	`return result;`