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/oframes.cxx | |
| parent | a98d7543ad599092081970c48c0c650c142cf762 (diff) | |
Consolidate framework::{Resetable,}Guard
Change-Id: I97290c2504992f4a92e6aeb71e02a2542dd35faa
Diffstat (limited to 'framework/source/helper/oframes.cxx')
| -rw-r--r-- | framework/source/helper/oframes.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index f0ce0c24611c..d20904a58c8d 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -19,7 +19,7 @@ #include <helper/oframes.hxx> -#include <threadhelp/resetableguard.hxx> +#include <threadhelp/guard.hxx> #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> @@ -68,7 +68,7 @@ OFrames::~OFrames() void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); // Safe impossible cases // Method is not defined for ALL incoming parameters! @@ -93,7 +93,7 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); // Safe impossible cases // Method is not defined for ALL incoming parameters! @@ -119,7 +119,7 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); // Safe impossible cases // Method is not defined for ALL incoming parameters! @@ -225,7 +225,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); // Set default return value. sal_Int32 nCount = 0; @@ -251,7 +251,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); sal_uInt32 nCount = m_pFrameContainer->getCount(); if ( nIndex < 0 || ( sal::static_int_cast< sal_uInt32 >( nIndex ) >= nCount )) @@ -288,7 +288,7 @@ Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception ) { // Ready for multithreading - ResetableGuard aGuard( m_aLock ); + Guard aGuard( m_aLock ); // Set default return value. sal_Bool bHasElements = sal_False; |