[QGIS Commit] r15030 - trunk/qgis/src/mapserver

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-01-13 02:08:18 -0800 (Thu, 13 Jan 2011)
New Revision: 15030

Modified:
   trunk/qgis/src/mapserver/qgsprojectparser.cpp
Log:
Fix usage of composer legend in mapserver print

Modified: trunk/qgis/src/mapserver/qgsprojectparser.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsprojectparser.cpp	2011-01-13 08:07:00 UTC (rev 15029)
+++ trunk/qgis/src/mapserver/qgsprojectparser.cpp	2011-01-13 10:08:18 UTC (rev 15030)
@@ -868,8 +868,11 @@
     }
     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" )