Wms print: keep not referenced labels with default text

mhugent · mhugent · commit b0ae192f219f · 2011-01-21T08:10:47.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15061 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/mapserver/qgsconfigparser.cpp b/src/mapserver/qgsconfigparser.cpp
@@ -386,9 +386,7 @@ QgsComposition* QgsConfigParser::createPrintComposition( const QString& composer
     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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -386,9 +386,7 @@ QgsComposition* QgsConfigParser::createPrintComposition( const QString& composer`
`386`	`386`	`QMap< QString, QString >::const_iterator titleIt = parameterMap.find( "LABEL" + QString::number( currentLabel->id() ) );`
`387`	`387`	`if ( titleIt == parameterMap.constEnd() )`
`388`	`388`	`{`
`389`		`- //remove label`
`390`		`- c->removeItem( *labelIt );`
`391`		`- delete( *labelIt );`
	`389`	`+ //keep label with default text and size`
`392`	`390`	`continue;`
`393`	`391`	`}`
`394`	`392`