summaryrefslogtreecommitdiff
path: root/framework/source/fwe/classes/rootactiontriggercontainer.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-17 18:00:10 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-17 18:00:10 +0100
commit07b32bc2bf0cd329258b4924839e5b900b7e6196 (patch)
tree72158346b5677065a032010c44f878ae2f6696df /framework/source/fwe/classes/rootactiontriggercontainer.cxx
parenta98d7543ad599092081970c48c0c650c142cf762 (diff)
Consolidate framework::{Resetable,}Guard
Change-Id: I97290c2504992f4a92e6aeb71e02a2542dd35faa
Diffstat (limited to 'framework/source/fwe/classes/rootactiontriggercontainer.cxx')
-rw-r--r--framework/source/fwe/classes/rootactiontriggercontainer.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 1ef8b9883381..6670e76ce49a 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -26,7 +26,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <framework/actiontriggerhelper.hxx>
#include <osl/mutex.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <vcl/svapp.hxx>
using namespace cppu;
@@ -126,7 +126,7 @@ throw ( RuntimeException, std::exception )
void SAL_CALL RootActionTriggerContainer::insertByIndex( sal_Int32 Index, const Any& Element )
throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_bContainerCreated )
FillContainer();
@@ -139,7 +139,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
void SAL_CALL RootActionTriggerContainer::removeByIndex( sal_Int32 Index )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_bContainerCreated )
FillContainer();
@@ -153,7 +153,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
void SAL_CALL RootActionTriggerContainer::replaceByIndex( sal_Int32 Index, const Any& Element )
throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_bContainerCreated )
FillContainer();
@@ -167,7 +167,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
sal_Int32 SAL_CALL RootActionTriggerContainer::getCount()
throw ( RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_bContainerCreated )
{
@@ -188,7 +188,7 @@ throw ( RuntimeException, std::exception )
Any SAL_CALL RootActionTriggerContainer::getByIndex( sal_Int32 Index )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
- ResetableGuard aGuard( m_aLock );
+ Guard aGuard( m_aLock );
if ( !m_bContainerCreated )
FillContainer();