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

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-01-21 00:10:47 -0800 (Fri, 21 Jan 2011)
New Revision: 15061

Modified:
   trunk/qgis/src/mapserver/qgsconfigparser.cpp
Log:
Wms print: keep not referenced labels with default text

Modified: trunk/qgis/src/mapserver/qgsconfigparser.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsconfigparser.cpp	2011-01-20 21:06:43 UTC (rev 15060)
+++ trunk/qgis/src/mapserver/qgsconfigparser.cpp	2011-01-21 08:10:47 UTC (rev 15061)
@@ -386,9 +386,7 @@
     QMap< QString, QString >::const_iterator titleIt = parameterMap.find( "LABEL" + QString::number( currentLabel->id() ) );
     if ( titleIt == parameterMap.constEnd() )
     {
-      //remove label
-      c->removeItem( *labelIt );
-      delete( *labelIt );
+      //keep label with default text and size
       continue;
     }