diff options
Diffstat (limited to 'framework/source/uielement/statusbarmanager.cxx')
-rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 9b6a86bc42ba..0c0e0e6b87ee 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -50,6 +50,7 @@ #include <vcl/settings.hxx> #include <vcl/commandinfoprovider.hxx> +#include <cassert> #include <functional> using namespace ::com::sun::star; @@ -161,21 +162,17 @@ throw ( uno::RuntimeException, std::exception ) void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) { - { - SolarMutexGuard g; - if ( m_bDisposed ) - return; - } + SolarMutexGuard g; + + if ( m_bDisposed ) + return; RemoveControllers(); - { - SolarMutexGuard g; - if ( Source.Source == uno::Reference< uno::XInterface >( m_xFrame, uno::UNO_QUERY )) - m_xFrame.clear(); + if ( Source.Source == uno::Reference< uno::XInterface >( m_xFrame, uno::UNO_QUERY )) + m_xFrame.clear(); - m_xContext.clear(); - } + m_xContext.clear(); } // XComponent @@ -279,10 +276,8 @@ void StatusBarManager::UpdateControllers() void StatusBarManager::RemoveControllers() { - SolarMutexGuard g; - - if ( m_bDisposed ) - return; + DBG_TESTSOLARMUTEX(); + assert(!m_bDisposed); std::for_each( m_aControllerMap.begin(), m_aControllerMap.end(), |