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/helper/ocomponentaccess.cxx | |
| parent | a98d7543ad599092081970c48c0c650c142cf762 (diff) | |
Consolidate framework::{Resetable,}Guard
Change-Id: I97290c2504992f4a92e6aeb71e02a2542dd35faa
Diffstat (limited to 'framework/source/helper/ocomponentaccess.cxx')
| -rw-r--r-- | framework/source/helper/ocomponentaccess.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index 142758d2e1e8..65a150f9648d 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -20,7 +20,7 @@ #include <helper/ocomponentaccess.hxx> #include <helper/ocomponentenumeration.hxx> -#include <threadhelp/resetableguard.hxx> +#include <threadhelp/guard.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> @@ -61,7 +61,7 @@ OComponentAccess::~OComponentAccess() css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); // Set default return value, if method failed. // If no desktop exist and there is no task container - return an empty enumeration! @@ -99,7 +99,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::e sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); // Set default return value, if method failed. sal_Bool bReturn = sal_False; |