diff options
Diffstat (limited to 'svl/source/notify/cancel.cxx')
| -rw-r--r-- | svl/source/notify/cancel.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svl/source/notify/cancel.cxx b/svl/source/notify/cancel.cxx index c84605c6202c..76ac32d4211d 100644 --- a/svl/source/notify/cancel.cxx +++ b/svl/source/notify/cancel.cxx @@ -31,14 +31,14 @@ #define _SFX_CANCEL_CXX #include <svl/cancel.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/debug.hxx> #include <svl/smplhint.hxx> #include <svl/cnclhint.hxx> #include <rtl/instance.hxx> -namespace { struct lclMutex : public rtl::Static< ::vos::OMutex, lclMutex >{}; } +namespace { struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex >{}; } //========================================================================= @@ -67,7 +67,7 @@ BOOL SfxCancelManager::CanCancel() const */ { - ::vos::OGuard aGuard( lclMutex::get() ); + ::osl::MutexGuard aGuard( lclMutex::get() ); return _aJobs.Count() > 0 || ( _pParent && _pParent->CanCancel() ); } @@ -82,7 +82,7 @@ void SfxCancelManager::Cancel( BOOL bDeep ) */ { - ::vos::OGuard aGuard( lclMutex::get() ); + ::osl::MutexGuard aGuard( lclMutex::get() ); SfxCancelManagerWeak xWeak( this ); for ( USHORT n = _aJobs.Count(); n-- && xWeak.Is(); ) if ( n < _aJobs.Count() ) @@ -111,7 +111,7 @@ void SfxCancelManager::InsertCancellable( SfxCancellable *pJob ) } #endif - ::vos::OClearableGuard aGuard( lclMutex::get() ); + ::osl::ClearableMutexGuard aGuard( lclMutex::get() ); _aJobs.C40_INSERT( SfxCancellable, pJob, _aJobs.Count() ); aGuard.clear(); @@ -132,7 +132,7 @@ void SfxCancelManager::RemoveCancellable( SfxCancellable *pJob ) */ { - ::vos::OClearableGuard aGuard( lclMutex::get() ); + ::osl::ClearableMutexGuard aGuard( lclMutex::get() ); const SfxCancellable *pTmp = pJob; USHORT nPos = _aJobs.GetPos( pTmp ); if ( nPos != 0xFFFF ) |