Skip to content
Permalink
Browse files

Fix cleanup of map composition. Fixes ticket #6440

  • Loading branch information
Marco Hugentobler
Marco Hugentobler committed Oct 9, 2012
1 parent a49a431 commit 65141e29eec30e8f70d42d3f6df3b160c5d65c57
Showing with 2 additions and 6 deletions.
  1. +0 −5 src/app/composer/qgscomposer.cpp
  2. +1 −1 src/app/composer/qgscomposer.h
  3. +1 −0 src/app/qgisapp.cpp
@@ -505,11 +505,6 @@ QgsComposerView *QgsComposer::view( void )
return mView;
}

/*QgsComposition *QgsComposer::composition(void)
{
return mComposition;
}*/

void QgsComposer::zoomFull( void )
{
if ( mView )
@@ -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();
@@ -4422,6 +4422,7 @@ void QgisApp::deletePrintComposers()
for ( ; it != mPrintComposers.end(); ++it )
{
emit composerWillBeRemoved(( *it )->view() );
delete ( (*it)->composition() );
delete( *it );
}
mPrintComposers.clear();

0 comments on commit 65141e2

Please sign in to comment.
You can’t perform that action at this time.