Fix cleanup of map composition. Fixes ticket #6440

Marco Hugentobler · Marco Hugentobler · commit 65141e29eec3 · 2012-10-09T09:46:38.000+02:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -505,11 +505,6 @@ QgsComposerView *QgsComposer::view( void )
   return mView;
 }
 
-/*QgsComposition *QgsComposer::composition(void)
-{
-  return mComposition;
-  }*/
-
 void QgsComposer::zoomFull( void )
 {
   if ( mView )
diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -78,7 +78,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     QgsComposerView *view( void );
 
     //! Return current composition
-    //QgsComposition *composition(void);
+    QgsComposition* composition(void){ return mComposition; }
 
     //! Restore the window and toolbar state
     void restoreWindowState();
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4422,6 +4422,7 @@ void QgisApp::deletePrintComposers()
   for ( ; it != mPrintComposers.end(); ++it )
   {
     emit composerWillBeRemoved(( *it )->view() );
+    delete ( (*it)->composition() );
     delete( *it );
   }
   mPrintComposers.clear();

Original file line number	Diff line number	Diff line change
`@@ -505,11 +505,6 @@ QgsComposerView *QgsComposer::view( void )`
`505`	`505`	`return mView;`
`506`	`506`	`}`
`507`	`507`
`508`		`-/QgsComposition QgsComposer::composition(void)`
`509`		`-{`
`510`		`- return mComposition;`
`511`		`- }*/`
`512`		`-`
`513`	`508`	`void QgsComposer::zoomFull( void )`
`514`	`509`	`{`
`515`	`510`	`if ( mView )`
Original file line number	Diff line number	Diff line change
`@@ -4422,6 +4422,7 @@ void QgisApp::deletePrintComposers()`
`4422`	`4422`	`for ( ; it != mPrintComposers.end(); ++it )`
`4423`	`4423`	`{`
`4424`	`4424`	`emit composerWillBeRemoved(( *it )->view() );`
	`4425`	`+ delete ( (*it)->composition() );`
`4425`	`4426`	`delete( *it );`
`4426`	`4427`	`}`
`4427`	`4428`	`mPrintComposers.clear();`