diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-17 18:00:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-17 18:00:10 +0100 |
| commit | 07b32bc2bf0cd329258b4924839e5b900b7e6196 (patch) | |
| tree | 72158346b5677065a032010c44f878ae2f6696df /framework/source/dispatch/popupmenudispatcher.cxx | |
| parent | a98d7543ad599092081970c48c0c650c142cf762 (diff) | |
Consolidate framework::{Resetable,}Guard
Change-Id: I97290c2504992f4a92e6aeb71e02a2542dd35faa
Diffstat (limited to 'framework/source/dispatch/popupmenudispatcher.cxx')
| -rw-r--r-- | framework/source/dispatch/popupmenudispatcher.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 1419cfe050aa..3a91779f6bd9 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -21,7 +21,6 @@ #include <general.h> #include <framework/menuconfiguration.hxx> #include <framework/addonmenu.hxx> -#include <threadhelp/resetableguard.hxx> #include <threadhelp/guard.hxx> #include <services.h> #include <properties.h> @@ -181,7 +180,7 @@ throw( css::uno::RuntimeException, std::exception ) if ( rURL.Complete.startsWith( "vnd.sun.star.popup:" ) ) { // --- SAFE --- - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); impl_RetrievePopupControllerQuery(); impl_CreateUriRefFactory(); @@ -260,7 +259,7 @@ void SAL_CALL PopupMenuDispatcher::addStatusListener( const uno::Reference< XSta throw( RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); // Safe impossible cases // Add listener to container. m_aListenerContainer.addInterface( aURL.Complete, xControl ); @@ -271,7 +270,7 @@ void SAL_CALL PopupMenuDispatcher::removeStatusListener( const uno::Reference< X throw( RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); // Safe impossible cases // Add listener to container. m_aListenerContainer.removeInterface( aURL.Complete, xControl ); @@ -280,7 +279,7 @@ throw( RuntimeException, std::exception ) void SAL_CALL PopupMenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException, std::exception ) { - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); if (( aEvent.Action == css::frame::FrameAction_COMPONENT_DETACHING ) || ( aEvent.Action == css::frame::FrameAction_COMPONENT_ATTACHED )) @@ -293,7 +292,7 @@ throw ( RuntimeException, std::exception ) void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); // Safe impossible cases SAL_WARN_IF( m_bAlreadyDisposed, "fwk", "MenuDispatcher::disposing(): Object already disposed .. don't call it again!" ); |