diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 15:07:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 15:27:08 +0100 |
| commit | f7d4bcfd4532a9b86d535f7b2a63532a240e758d (patch) | |
| tree | 5c2ebc1c64cf4d8066d770de6e767d8edbf279c9 /framework/source/uielement/addonstoolbarwrapper.cxx | |
| parent | Use SolarMutexGuard directly (diff) | |
| download | core-f7d4bcfd4532a9b86d535f7b2a63532a240e758d.tar.gz core-f7d4bcfd4532a9b86d535f7b2a63532a240e758d.zip | |
Use SolarMutexGuard directly
Change-Id: Iffc5e75c45502c770e9a3eee2a327df1e6843c9f
Diffstat (limited to 'framework/source/uielement/addonstoolbarwrapper.cxx')
| -rw-r--r-- | framework/source/uielement/addonstoolbarwrapper.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 75418fab3a0f..03698c1bba45 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -71,7 +71,7 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exc com::sun::star::lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); - Guard aLock( m_aLock ); + SolarMutexGuard g; if ( m_xToolBarManager.is() ) m_xToolBarManager->dispose(); @@ -83,7 +83,7 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exc // XInitialization void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { - Guard aLock( m_aLock ); + SolarMutexGuard g; if ( m_bDisposed ) throw DisposedException(); @@ -145,7 +145,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument // XUIElement interface Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) { - Guard aLock( m_aLock ); + SolarMutexGuard g; if ( m_xToolBarManager.is() ) { @@ -163,7 +163,7 @@ Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw // allow late population of images for add-on toolbars void AddonsToolBarWrapper::populateImages() { - Guard aLock( m_aLock ); + SolarMutexGuard g; if (m_bCreatedImages) return; |