diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:20:00 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | d88b292704957818eff9a348a524b5c90b40031b (patch) | |
| tree | eabf039491304b2c13f3bd77ca0b6d58c3dba1b8 /unotools/source/accessibility/accessiblestatesethelper.cxx | |
| parent | 98b2c08dff4d00b3e7a2e001c326ebe27dae4549 (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'unotools/source/accessibility/accessiblestatesethelper.cxx')
| -rw-r--r-- | unotools/source/accessibility/accessiblestatesethelper.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx index 8927f3cfb6e0..d2f1e50960f6 100644 --- a/unotools/source/accessibility/accessiblestatesethelper.cxx +++ b/unotools/source/accessibility/accessiblestatesethelper.cxx @@ -207,7 +207,7 @@ AccessibleStateSetHelper::~AccessibleStateSetHelper(void) sal_Bool SAL_CALL AccessibleStateSetHelper::isEmpty () throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); return mpHelperImpl->IsEmpty(); } @@ -225,7 +225,7 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::isEmpty () sal_Bool SAL_CALL AccessibleStateSetHelper::contains (sal_Int16 aState) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); return mpHelperImpl->Contains(aState); } @@ -248,7 +248,7 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll (const uno::Sequence<sal_Int16>& rStateSet) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); sal_Int32 nCount(rStateSet.getLength()); const sal_Int16* pStates = rStateSet.getConstArray(); sal_Int32 i = 0; @@ -264,21 +264,21 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSetHelper::getStates() throw (uno::RuntimeException) { - ::vos::OGuard aGuard(maMutex); + osl::MutexGuard aGuard(maMutex); return mpHelperImpl->GetStates(); } void AccessibleStateSetHelper::AddState(sal_Int16 aState) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); mpHelperImpl->AddState(aState); } void AccessibleStateSetHelper::RemoveState(sal_Int16 aState) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); mpHelperImpl->RemoveState(aState); } @@ -288,7 +288,7 @@ sal_Bool AccessibleStateSetHelper::Compare( AccessibleStateSetHelper& rNewStates) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); return mpHelperImpl->Compare(rComparativeValue.mpHelperImpl, rOldStates.mpHelperImpl, rNewStates.mpHelperImpl); } @@ -314,7 +314,7 @@ uno::Sequence<sal_Int8> SAL_CALL AccessibleStateSetHelper::getImplementationId (void) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); static uno::Sequence<sal_Int8> aId; if (aId.getLength() == 0) { |