Remove map items not referenced in the GetPrint request

mhugent · mhugent · commit f34ee9c54561 · 2011-01-13T13:01:37.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15031 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/mapserver/qgsconfigparser.cpp b/src/mapserver/qgsconfigparser.cpp
@@ -304,6 +304,9 @@ QgsComposition* QgsConfigParser::createPrintComposition( const QString& composer
     QMap< QString, QString >::const_iterator titleIt = parameterMap.find( "MAP" + QString::number( currentMap->id() ) );
     if ( titleIt == parameterMap.constEnd() )
     {
+      //remove map from composition if not referenced by the request
+      c->removeItem( *mapIt );
+      delete( *mapIt );
       continue;
     }
     QString replaceString = titleIt.value();

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,9 @@ QgsComposition* QgsConfigParser::createPrintComposition( const QString& composer`
`304`	`304`	`QMap< QString, QString >::const_iterator titleIt = parameterMap.find( "MAP" + QString::number( currentMap->id() ) );`
`305`	`305`	`if ( titleIt == parameterMap.constEnd() )`
`306`	`306`	`{`
	`307`	`+ //remove map from composition if not referenced by the request`
	`308`	`+ c->removeItem( *mapIt );`
	`309`	`+ delete( *mapIt );`
`307`	`310`	`continue;`
`308`	`311`	`}`
`309`	`312`	`QString replaceString = titleIt.value();`