Consolidate framework::{Resetable,}Guard

Change-Id: I97290c2504992f4a92e6aeb71e02a2542dd35faa

3 files changed, 13 insertions, 13 deletions

diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index a71c621e5ed2..a775af308d1e 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -21,7 +21,7 @@
 #include <general.h>
 #include <framework/menuconfiguration.hxx>
 #include <framework/addonmenu.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
 #include <services.h>
 
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
@@ -113,7 +113,7 @@ void SAL_CALL MenuDispatcher::addStatusListener(   const   uno::Reference< XStat
                                                     const   URL&                            aURL    ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
-    ResetableGuard aGuard( m_aLock );
+    Guard aGuard( m_aLock );
     // Safe impossible cases
     // Method not defined for all incoming parameter
     SAL_WARN_IF( !impldbg_checkParameter_addStatusListener( xControl, aURL ), "fwk", "MenuDispatcher::addStatusListener(): Invalid parameter detected." );
@@ -128,7 +128,7 @@ void SAL_CALL MenuDispatcher::removeStatusListener(    const   uno::Reference< X
                                                         const   URL&                            aURL    ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
-    ResetableGuard aGuard( m_aLock );
+    Guard aGuard( m_aLock );
     // Safe impossible cases
     // Method not defined for all incoming parameter
     SAL_WARN_IF( !impldbg_checkParameter_removeStatusListener( xControl, aURL ), "fwk", "MenuDispatcher::removeStatusListener(): Invalid parameter detected." );
@@ -142,7 +142,7 @@ void SAL_CALL MenuDispatcher::removeStatusListener(    const   uno::Reference< X
 
 void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException, std::exception )
 {
-    ResetableGuard aGuard( m_aLock );
+    Guard aGuard( m_aLock );
 
     if ( m_pMenuManager && aEvent.Action == FrameAction_FRAME_UI_ACTIVATED )
     {
@@ -180,7 +180,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro
 void SAL_CALL MenuDispatcher::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!" );
 
@@ -255,7 +255,7 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR
         if ( pWindow )
         {
             // Ready for multithreading
-            ResetableGuard aGuard( m_aLock );
+            Guard aGuard( m_aLock );
 
             SystemWindow* pSysWindow = (SystemWindow *)pWindow;
 
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index de0fa0bdc3cb..b24eaecfa288 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <dispatch/oxt_handler.hxx>
+#include <threadhelp/guard.hxx>
 #include <threadhelp/transactionguard.hxx>
 #include <services.h>
 #include <unotools/mediadescriptor.hxx>
@@ -117,7 +118,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
     throw( css::uno::RuntimeException, std::exception )
 {
     // SAFE {
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
 
     OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog";
     css::uno::Sequence< css::uno::Any > lParams(1);
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!" );