merge vosremoval-mutex.diff

In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually

2 files changed, 15 insertions, 15 deletions

diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index 20fffdf7070f..55cfa3e6ef42 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -168,7 +168,7 @@ sal_Int32 SAL_CALL
     AccessibleRelationSetHelper::getRelationCount(  )
         throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard (maMutex);
+    osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->getRelationCount();
 }
 
@@ -190,7 +190,7 @@ sal_Int32 SAL_CALL
             throw (lang::IndexOutOfBoundsException,
                     uno::RuntimeException)
 {
-    ::vos::OGuard aGuard (maMutex);
+    osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->getRelation(nIndex);
 }
 
@@ -210,7 +210,7 @@ sal_Bool SAL_CALL
     AccessibleRelationSetHelper::containsRelation( sal_Int16 aRelationType )
         throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard (maMutex);
+    osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->containsRelation(aRelationType);
 }
 
@@ -229,14 +229,14 @@ AccessibleRelation SAL_CALL
         AccessibleRelationSetHelper::getRelationByType( sal_Int16 aRelationType )
             throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard (maMutex);
+    osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->getRelationByType(aRelationType);
 }
 
 void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelation)
             throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard (maMutex);
+    osl::MutexGuard aGuard (maMutex);
     mpHelperImpl->AddRelation(rRelation);
 }
 
@@ -246,7 +246,7 @@ uno::Sequence< ::com::sun::star::uno::Type>
     AccessibleRelationSetHelper::getTypes (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard (maMutex);
+    osl::MutexGuard aGuard (maMutex);
     const ::com::sun::star::uno::Type aTypeList[] = {
         ::getCppuType((const uno::Reference<
             XAccessibleRelationSet>*)0),
@@ -262,7 +262,7 @@ uno::Sequence<sal_Int8> SAL_CALL
     AccessibleRelationSetHelper::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)
     {
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)
     {