Follow up 0bda714

nyalldawson · nyalldawson · commit 2b36dea1f75f · 2014-10-21T20:49:18.000+11:00
Ensure that mLegendFilterByMap is set before setting the map when
reading legend xml
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -353,6 +353,7 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
   mSettings.setWrapChar( itemElem.attribute( "wrapChar" ) );
 
   //composer map
+  mLegendFilterByMap = itemElem.attribute( "legendFilterByMap", "0" ).toInt();
   if ( !itemElem.attribute( "map" ).isEmpty() )
   {
     setComposerMap( mComposition->getComposerMapById( itemElem.attribute( "map" ).toInt() ) );
@@ -369,8 +370,6 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
     _readXML( composerItemElem, doc );
   }
 
-  mLegendFilterByMap = itemElem.attribute( "legendFilterByMap", "0" ).toInt();
-
   // < 2.0 projects backward compatibility >>>>>
   //title font
   QString titleFontString = itemElem.attribute( "titleFont" );

Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,7 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument`
`353`	`353`	`mSettings.setWrapChar( itemElem.attribute( "wrapChar" ) );`
`354`	`354`
`355`	`355`	`//composer map`
	`356`	`+ mLegendFilterByMap = itemElem.attribute( "legendFilterByMap", "0" ).toInt();`
`356`	`357`	`if ( !itemElem.attribute( "map" ).isEmpty() )`
`357`	`358`	`{`
`358`	`359`	`setComposerMap( mComposition->getComposerMapById( itemElem.attribute( "map" ).toInt() ) );`
`@@ -369,8 +370,6 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument`
`369`	`370`	`_readXML( composerItemElem, doc );`
`370`	`371`	`}`
`371`	`372`
`372`		`- mLegendFilterByMap = itemElem.attribute( "legendFilterByMap", "0" ).toInt();`
`373`		`-`
`374`	`373`	`// < 2.0 projects backward compatibility >>>>>`
`375`	`374`	`//title font`
`376`	`375`	`QString titleFontString = itemElem.attribute( "titleFont" );`