Fix usage of composer legend in mapserver print

mhugent · mhugent · commit 8ed3c0aba0e2 · 2011-01-13T10:08:18.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15030 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -868,8 +868,11 @@ QgsComposition* QgsProjectParser::initComposition( const QString& composerTempla
     }
     else if ( elemName == "ComposerLegend" )
     {
+      //legend needs to be loaded indirectly to have generic content
+      //and to avoid usage of x-server with pixmap icons
       QgsComposerLegend* legend = new QgsComposerLegend( composition );
-      legend->readXML( currentElem, *mXMLDoc );
+      legend->_readXML( currentElem.firstChildElement( "ComposerItem" ), *mXMLDoc );
+      legend->updateLegend();
       composition->addItem( legend );
     }
     else if ( elemName == "ComposerShape" )

Original file line number	Diff line number	Diff line change
`@@ -868,8 +868,11 @@ QgsComposition* QgsProjectParser::initComposition( const QString& composerTempla`
`868`	`868`	`}`
`869`	`869`	`else if ( elemName == "ComposerLegend" )`
`870`	`870`	`{`
	`871`	`+ //legend needs to be loaded indirectly to have generic content`
	`872`	`+ //and to avoid usage of x-server with pixmap icons`
`871`	`873`	`QgsComposerLegend* legend = new QgsComposerLegend( composition );`
`872`		`- legend->readXML( currentElem, *mXMLDoc );`
	`874`	`+ legend->_readXML( currentElem.firstChildElement( "ComposerItem" ), *mXMLDoc );`
	`875`	`+ legend->updateLegend();`
`873`	`876`	`composition->addItem( legend );`
`874`	`877`	`}`
`875`	`878`	`else if ( elemName == "ComposerShape" )`