sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-10 00:08:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix cleanup of map composition. Fixes ticket #6440

Browse Source
This commit is contained in:
Marco Hugentobler 2012-10-09 09:46:03 +02:00
parent a49a431014
commit 65141e29ee
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/composer/qgscomposer.cpp
View File

@ -505,11 +505,6 @@ QgsComposerView *QgsComposer::view( void )
return mView; return mView;
} }
/*QgsComposition *QgsComposer::composition(void)
{
return mComposition;
}*/
void QgsComposer::zoomFull( void ) void QgsComposer::zoomFull( void )
{ {
if ( mView ) if ( mView )

2
src/app/composer/qgscomposer.h
View File

@ -78,7 +78,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
QgsComposerView *view( void ); QgsComposerView *view( void );
//! Return current composition //! Return current composition
//QgsComposition *composition(void); QgsComposition* composition(void){ return mComposition; }
//! Restore the window and toolbar state //! Restore the window and toolbar state
void restoreWindowState(); void restoreWindowState();

1
src/app/qgisapp.cpp
View File

@ -4422,6 +4422,7 @@ void QgisApp::deletePrintComposers()
for ( ; it != mPrintComposers.end(); ++it ) for ( ; it != mPrintComposers.end(); ++it )
{ {
emit composerWillBeRemoved(( *it )->view() ); emit composerWillBeRemoved(( *it )->view() );
delete ( (*it)->composition() );
delete( *it ); delete( *it );
} }
mPrintComposers.clear(); mPrintComposers.clear();