diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 11:34:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 11:34:58 +0000 |
| commit | 18698a1d162086087e91c7d3a3b3175d7dd8b519 (patch) | |
| tree | d5ad571630c2dffbdc8baee96ebda970009ba962 /framework | |
| parent | 6cd1bce9e6802b484e6aad7fd5e34986130e8b70 (diff) | |
INTEGRATION: CWS fwk86 (1.69.28); FILE MERGED
2008/04/30 15:28:21 pb 1.69.28.2: RESYNC: (1.69-1.70); FILE MERGED
2008/03/06 10:29:25 cd 1.69.28.1: #i86098# Prevent crash when layout manager is destroyed and deinitialized via disposing
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 843c7db7b0e2..caa52cc7022d 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: layoutmanager.cxx,v $ - * $Revision: 1.70 $ + * $Revision: 1.71 $ * * This file is part of OpenOffice.org. * @@ -415,6 +415,13 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM LayoutManager::~LayoutManager() { + Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) ); + if ( m_pMiscOptions ) + { + m_pMiscOptions->RemoveListener( LINK( this, LayoutManager, OptionsChanged ) ); + delete m_pMiscOptions; + m_pMiscOptions = 0; + } m_aAsyncLayoutTimer.Stop(); } |