Consolidate framework::{Resetable,}Guard

Change-Id: I97290c2504992f4a92e6aeb71e02a2542dd35faa

2 files changed, 13 insertions, 13 deletions

diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index 87cdebc8f88a..a5079773b804 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <uielement/addonstoolbarwrapper.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
 
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
@@ -180,7 +180,7 @@ throw ( ::com::sun::star::container::NoSuchElementException,
         ::com::sun::star::uno::RuntimeException, std::exception )
 {
     // SAFE
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
 
     Sequence< Sequence< PropertyValue > >   aConfigData;
     Reference< XFrame >                     xFrame;
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 3bd67f9dab05..5320caaf52da 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "uifactory/factoryconfiguration.hxx"
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
 #include "services.h"
 
 #include "helper/mischelper.hxx"
@@ -75,7 +75,7 @@ ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( co
 ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory()
 {
     // SAFE
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
 
     Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
     if ( xContainer.is() )
@@ -85,7 +85,7 @@ ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory()
 OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const
 {
     // SAFE
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
     MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
 
     if ( pIter != m_aMenuControllerMap.end() )
@@ -104,7 +104,7 @@ OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( con
 OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const
 {
     // SAFE
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
 
     MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
 
@@ -129,7 +129,7 @@ void ConfigurationAccess_ControllerFactory::addServiceToCommandModule(
     const OUString& rServiceSpecifier )
 {
     // SAFE
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
 
     OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
     m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey,ControllerInfo(rServiceSpecifier,OUString()) ));
@@ -140,7 +140,7 @@ void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule(
     const OUString& rModule )
 {
     // SAFE
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
 
     OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
     m_aMenuControllerMap.erase( aHashKey );
@@ -155,7 +155,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont
     OUString   aValue;
 
     // SAFE
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
 
     if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService, aValue ))
     {
@@ -176,7 +176,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const Cont
     OUString   aValue;
 
     // SAFE
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
 
     if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService, aValue ))
     {
@@ -197,14 +197,14 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObjec
 {
     // SAFE
     // remove our reference to the config access
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
     m_xConfigAccess.clear();
 }
 
 void ConfigurationAccess_ControllerFactory::readConfigurationData()
 {
     // SAFE
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
 
     if ( !m_bConfigAccessInitialized )
     {
@@ -246,7 +246,7 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData()
 void ConfigurationAccess_ControllerFactory::updateConfigurationData()
 {
     // SAFE
-    ResetableGuard aLock( m_aLock );
+    Guard aLock( m_aLock );
     if ( m_xConfigAccess.is() )
     {
         Sequence< OUString >   aPopupMenuControllers = m_xConfigAccess->getElementNames();