merge vosremoval-mutex.diff

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

14 files changed, 66 insertions, 66 deletions

diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 68705dd4196c..d0ba1db4e124 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sw.hxx"
 
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -123,7 +123,7 @@ sal_Bool SwAccessibleCell::_InvalidateMyCursorPos()
     sal_Bool bNew = IsSelected();
     sal_Bool bOld;
     {
-        vos::OGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( aMutex );
         bOld = bIsSelected;
         bIsSelected = bNew;
     }
@@ -212,7 +212,7 @@ void SwAccessibleCell::_InvalidateCursorPos()
 
 sal_Bool SwAccessibleCell::HasCursor()
 {
-    vos::OGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( aMutex );
     return bIsSelected;
 }
 
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index d55769b0fecf..5ecac81f9a89 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
@@ -106,7 +106,7 @@ void SwAccessibleContext::InitStates()
 
 void SwAccessibleContext::SetParent( SwAccessibleContext *pParent )
 {
-    vos::OGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( aMutex );
 
     uno::Reference < XAccessible > xParent( pParent );
     xWeakParent = xParent;
@@ -114,7 +114,7 @@ void SwAccessibleContext::SetParent( SwAccessibleContext *pParent )
 
 uno::Reference< XAccessible > SwAccessibleContext::GetWeakParent() const
 {
-    vos::OGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( aMutex );
 
     uno::Reference< XAccessible > xParent( xWeakParent );
     return xParent;
@@ -323,7 +323,7 @@ void SwAccessibleContext::Scrolled( const SwRect& rOldVisArea )
     sal_Bool bIsOldShowingState;
     sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) );
     {
-        vos::OGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( aMutex );
         bIsOldShowingState = bIsShowingState;
         bIsShowingState = bIsNewShowingState;
     }
@@ -552,7 +552,7 @@ sal_Bool SwAccessibleContext::IsEditableState()
 {
     sal_Bool bRet;
     {
-        vos::OGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( aMutex );
         bRet = bIsEditableState;
     }
 
@@ -663,7 +663,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent (
 
     // Remember the parent as weak ref.
     {
-        vos::OGuard aWeakParentGuard( aMutex );
+        osl::MutexGuard aWeakParentGuard( aMutex );
         xWeakParent = xAcc;
     }
 
@@ -1110,7 +1110,7 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive )
     // set defunc state (its not required to broadcast a state changed
     // event if the object is diposed afterwards)
     {
-        vos::OGuard aDefuncStateGuard( aMutex );
+        osl::MutexGuard aDefuncStateGuard( aMutex );
         bIsDefuncState = sal_True;
     }
 
@@ -1179,7 +1179,7 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
     sal_Bool bIsOldShowingState;
     sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) );
     {
-        vos::OGuard aShowingStateGuard( aMutex );
+        osl::MutexGuard aShowingStateGuard( aMutex );
         bIsOldShowingState = bIsShowingState;
         bIsShowingState = bIsNewShowingState;
     }
@@ -1336,7 +1336,7 @@ void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates )
                 sal_Bool bIsOldEditableState;
                 sal_Bool bIsNewEditableState = IsEditable( pVSh );
                 {
-                    vos::OGuard aGuard( aMutex );
+                    osl::MutexGuard aGuard( aMutex );
                     bIsOldEditableState = bIsEditableState;
                     bIsEditableState = bIsNewEditableState;
                 }
@@ -1350,7 +1350,7 @@ void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates )
                 sal_Bool bIsOldOpaqueState;
                 sal_Bool bIsNewOpaqueState = IsOpaque( pVSh );
                 {
-                    vos::OGuard aGuard( aMutex );
+                    osl::MutexGuard aGuard( aMutex );
                     bIsOldOpaqueState = bIsOpaqueState;
                     bIsOpaqueState = bIsNewOpaqueState;
                 }
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 605b815f46e3..5bb7159e9066 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -71,7 +71,7 @@ class SwAccessibleContext :
 protected:
 
     mutable ::osl::Mutex aListenerMutex;
-    mutable ::vos::OMutex aMutex;
+    mutable ::osl::Mutex aMutex;
 
 private:
 
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 222080222d49..68a9e824e70a 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -39,7 +39,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <tools/link.hxx>
 #include <sfx2/viewsh.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <viewsh.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 96f823b31db8..2efd6cf6d78f 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sw.hxx"
 
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index 39c4d2039a73..b5ce138c7ada 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <frmfmt.hxx>
@@ -153,7 +153,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos()
     sal_Bool bOldSelected;
 
     {
-        vos::OGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( aMutex );
         bOldSelected = bIsSelected;
         bIsSelected = bNewSelected;
     }
@@ -196,7 +196,7 @@ void SwAccessibleFrameBase::_InvalidateFocus()
         sal_Bool bSelected;
 
         {
-            vos::OGuard aGuard( aMutex );
+            osl::MutexGuard aGuard( aMutex );
             bSelected = bIsSelected;
         }
         ASSERT( bSelected, "focus object should be selected" );
@@ -208,7 +208,7 @@ void SwAccessibleFrameBase::_InvalidateFocus()
 
 sal_Bool SwAccessibleFrameBase::HasCursor()
 {
-    vos::OGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( aMutex );
     return bIsSelected;
 }
 
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 049b2a0cf32c..6472f75e9fe5 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sw.hxx"
 
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 93e49ebb8a38..cf681c0c6380 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sw.hxx"
 #include <comphelper/accessiblekeybindinghelper.hxx>
 #include <swurl.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <ndtxt.hxx>
 #include <txtinet.hxx>
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 92bc4fa7e9c6..2d48e504e9ab 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -856,7 +856,7 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
 
 void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
 {
-    vos::OGuard aGuard( maEventMutex );
+    osl::MutexGuard aGuard( maEventMutex );
 
     if( !mpEvents )
         mpEvents = new SwAccessibleEventList_Impl;
@@ -1012,7 +1012,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection()
     sal_uInt16 nSelShapes = pFESh ? pFESh->IsObjSelected() : 0;
 
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
         if( mpShapeMap )
             pShapes = mpShapeMap->Copy( nShapes, pFESh, &pSelShape );
     }
@@ -1063,7 +1063,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection()
             {
                 ::rtl::Reference< SwAccessibleContext > xParentAccImpl;
                 {
-                    vos::OGuard aGuard( maMutex );
+                    osl::MutexGuard aGuard( maMutex );
                     if(  mpFrmMap )
                     {
                         SwAccessibleContextMap_Impl::const_iterator aMapIter =
@@ -1107,7 +1107,7 @@ void SwAccessibleMap::DoInvalidateShapeFocus()
 
 
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
         if( mpShapeMap )
             pShapes = mpShapeMap->Copy( nShapes, pFESh, &pSelShape );
     }
@@ -1157,7 +1157,7 @@ SwAccessibleMap::~SwAccessibleMap()
 {
     uno::Reference < XAccessible > xAcc;
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
         if( mpFrmMap )
         {
             const SwRootFrm *pRootFrm = GetShell()->GetLayout();
@@ -1174,7 +1174,7 @@ SwAccessibleMap::~SwAccessibleMap()
     pAcc->Dispose( sal_True );
 
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
 #ifdef DBG_UTIL
         ASSERT( !mpFrmMap || mpFrmMap->empty(),
                 "Frame map should be empty after disposing the root frame" );
@@ -1225,7 +1225,7 @@ SwAccessibleMap::~SwAccessibleMap()
     mpPreview = NULL;
 
     {
-        vos::OGuard aGuard( maEventMutex );
+        osl::MutexGuard aGuard( maEventMutex );
 #ifdef DBG_UTIL
         ASSERT( !(mpEvents || mpEventMap), "pending events" );
         if( mpEvents )
@@ -1260,7 +1260,7 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
     sal_Bool bSetVisArea = sal_False;
 
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
 
         if( !mpFrmMap )
         {
@@ -1345,7 +1345,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
     sal_Bool bOldShapeSelected = sal_False;
 
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
 
         if( !mpFrmMap && bCreate )
             mpFrmMap = new SwAccessibleContextMap_Impl;
@@ -1489,7 +1489,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext(
     uno::Reference < XAccessible > xOldCursorAcc;
 
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
 
         if( !mpShapeMap && bCreate )
             mpShapeMap = new SwAccessibleShapeMap_Impl( this );
@@ -1562,7 +1562,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext(
 
 void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
 {
-    vos::OGuard aGuard( maMutex );
+    osl::MutexGuard aGuard( maMutex );
 
     if( mpFrmMap )
     {
@@ -1599,7 +1599,7 @@ void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
 
 void SwAccessibleMap::RemoveContext( const SdrObject *pObj )
 {
-    vos::OGuard aGuard( maMutex );
+    osl::MutexGuard aGuard( maMutex );
 
     if( mpShapeMap )
     {
@@ -1644,7 +1644,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
         ::rtl::Reference< ::accessibility::AccessibleShape > xShapeAccImpl;
         // get accessible context for frame
         {
-            vos::OGuard aGuard( maMutex );
+            osl::MutexGuard aGuard( maMutex );
 
             // First of all look for an accessible context for a frame
             if( aFrmOrObj.GetSwFrm() && mpFrmMap )
@@ -1708,7 +1708,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
 
         // remove events stored for the frame
         {
-            vos::OGuard aGuard( maEventMutex );
+            osl::MutexGuard aGuard( maEventMutex );
             if( mpEvents )
             {
                 SwAccessibleEventMap_Impl::iterator aIter =
@@ -1761,7 +1761,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
         ::rtl::Reference< SwAccessibleContext > xAccImpl;
         ::rtl::Reference< SwAccessibleContext > xParentAccImpl;
         {
-            vos::OGuard aGuard( maMutex );
+            osl::MutexGuard aGuard( maMutex );
 
             if( mpFrmMap )
             {
@@ -1842,7 +1842,7 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
     {
         uno::Reference < XAccessible > xAcc;
         {
-            vos::OGuard aGuard( maMutex );
+            osl::MutexGuard aGuard( maMutex );
 
             if( mpFrmMap )
             {
@@ -1880,7 +1880,7 @@ void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm )
     {
         uno::Reference < XAccessible > xAcc;
         {
-            vos::OGuard aGuard( maMutex );
+            osl::MutexGuard aGuard( maMutex );
 
             if( mpFrmMap )
             {
@@ -1951,7 +1951,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
     sal_Bool bOldShapeSelected = sal_False;
 
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
 
         xOldAcc = mxCursorContext;
         mxCursorContext = xAcc; // clear reference
@@ -2008,7 +2008,7 @@ void SwAccessibleMap::InvalidateFocus()
     uno::Reference < XAccessible > xAcc;
     sal_Bool bShapeSelected;
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
 
         xAcc = mxCursorContext;
         bShapeSelected = mbShapeSelected;
@@ -2029,7 +2029,7 @@ void SwAccessibleMap::InvalidateFocus()
 void SwAccessibleMap::SetCursorContext(
         const ::rtl::Reference < SwAccessibleContext >& rCursorContext )
 {
-    vos::OGuard aGuard( maMutex );
+    osl::MutexGuard aGuard( maMutex );
     uno::Reference < XAccessible > xAcc( rCursorContext.get() );
     mxCursorContext = xAcc;
 }
@@ -2072,7 +2072,7 @@ void SwAccessibleMap::_InvalidateRelationSet( const SwFrm* pFrm,
     {
         uno::Reference < XAccessible > xAcc;
         {
-            vos::OGuard aGuard( maMutex );
+            osl::MutexGuard aGuard( maMutex );
 
             if( mpFrmMap )
             {
@@ -2133,7 +2133,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm )
     {
         uno::Reference < XAccessible > xAcc;
         {
-            vos::OGuard aGuard( maMutex );
+            osl::MutexGuard aGuard( maMutex );
 
             if( mpFrmMap )
             {
@@ -2179,7 +2179,7 @@ sal_Int32 SwAccessibleMap::GetChildIndex( const SwFrm& rParentFrm,
     {
         uno::Reference < XAccessible > xAcc;
         {
-            vos::OGuard aGuard( maMutex );
+            osl::MutexGuard aGuard( maMutex );
 
             if( mpFrmMap )
             {
@@ -2225,7 +2225,7 @@ void SwAccessibleMap::UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages
     uno::Reference < XAccessible > xOldAcc;
     uno::Reference < XAccessible > xAcc;
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
 
         xOldAcc = mxCursorContext;
 
@@ -2255,7 +2255,7 @@ void SwAccessibleMap::InvalidatePreViewSelection( sal_uInt16 nSelPage )
     uno::Reference < XAccessible > xOldAcc;
     uno::Reference < XAccessible > xAcc;
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
 
         xOldAcc = mxCursorContext;
 
@@ -2285,7 +2285,7 @@ sal_Bool SwAccessibleMap::IsPageSelected( const SwPageFrm *pPageFrm ) const
 void SwAccessibleMap::FireEvents()
 {
     {
-        vos::OGuard aGuard( maEventMutex );
+        osl::MutexGuard aGuard( maEventMutex );
         if( mpEvents )
         {
             mpEvents->SetFiring();
@@ -2304,7 +2304,7 @@ void SwAccessibleMap::FireEvents()
         }
     }
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
         if( mpShapes )
         {
             delete mpShapes;
@@ -2406,7 +2406,7 @@ sal_Bool SwAccessibleMap::ReplaceChild (
 {
     const SdrObject *pObj = 0;
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
         if( mpShapeMap )
         {
             SwAccessibleShapeMap_Impl::const_iterator aIter = mpShapeMap->begin();
@@ -2436,7 +2436,7 @@ sal_Bool SwAccessibleMap::ReplaceChild (
     Dispose( 0, pObj, 0 );
 
     {
-        vos::OGuard aGuard( maMutex );
+        osl::MutexGuard aGuard( maMutex );
 
         if( !mpShapeMap )
             mpShapeMap = new SwAccessibleShapeMap_Impl( this );
@@ -2675,7 +2675,7 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
 
 void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
 {
-    vos::OGuard aGuard( maMutex );
+    osl::MutexGuard aGuard( maMutex );
 
     // keep previously known selected paragraphs
     SwAccessibleSelectedParas_Impl* pPrevSelectedParas( mpSelectedParas );
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index eca5093a68cc..e5790414e24c 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sw.hxx"
 
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 80a1f6bf3fb2..0cee1c1f2b5e 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -85,7 +85,7 @@ void SwAccessiblePage::_InvalidateCursorPos()
     sal_Bool bOldSelected;
 
     {
-        vos::OGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( aMutex );
         bOldSelected = bIsSelected;
         bIsSelected = bNewSelected;
     }
@@ -114,7 +114,7 @@ void SwAccessiblePage::_InvalidateFocus()
         sal_Bool bSelected;
 
         {
-            vos::OGuard aGuard( aMutex );
+            osl::MutexGuard aGuard( aMutex );
             bSelected = bIsSelected;
         }
         ASSERT( bSelected, "focus object should be selected" );
@@ -147,7 +147,7 @@ SwAccessiblePage::~SwAccessiblePage()
 
 sal_Bool SwAccessiblePage::HasCursor()
 {
-    vos::OGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( aMutex );
     return bIsSelected;
 }
 
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 16a973662101..f774805b12c2 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -39,7 +39,7 @@
 #include <accmap.hxx>
 #include <fesh.hxx>
 #include <viewopt.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -405,7 +405,7 @@ void SwAccessibleParagraph::_InvalidateContent( sal_Bool bVisibleDataFired )
     sal_Bool bNewIsHeading = IsHeading();
     sal_Bool bOldIsHeading;
     {
-        vos::OGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( aMutex );
         bOldIsHeading = bIsHeading;
         if( bIsHeading != bNewIsHeading )
             bIsHeading = bNewIsHeading;
@@ -417,7 +417,7 @@ void SwAccessibleParagraph::_InvalidateContent( sal_Bool bVisibleDataFired )
         ::rtl::OUString sNewDesc( GetDescription() );
         ::rtl::OUString sOldDesc;
         {
-            vos::OGuard aGuard( aMutex );
+            osl::MutexGuard aGuard( aMutex );
             sOldDesc = sDesc;
             if( sDesc != sNewDesc )
                 sDesc = sNewDesc;
@@ -442,7 +442,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos()
     sal_Int32 nNew = GetCaretPos();
     sal_Int32 nOld;
     {
-        vos::OGuard aGuard( aMutex );
+        osl::MutexGuard aGuard( aMutex );
         nOld = nOldCaretPos;
         nOldCaretPos = nNew;
     }
@@ -481,7 +481,7 @@ void SwAccessibleParagraph::_InvalidateFocus()
     {
         sal_Int32 nPos;
         {
-            vos::OGuard aGuard( aMutex );
+            osl::MutexGuard aGuard( aMutex );
             nPos = nOldCaretPos;
         }
         ASSERT( nPos != -1, "focus object should be selected" );
@@ -532,7 +532,7 @@ SwAccessibleParagraph::~SwAccessibleParagraph()
 
 sal_Bool SwAccessibleParagraph::HasCursor()
 {
-    vos::OGuard aGuard( aMutex );
+    osl::MutexGuard aGuard( aMutex );
     return nOldCaretPos != -1;
 }
 
@@ -838,7 +838,7 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary(
 
     CHECK_FOR_DEFUNC( XAccessibleContext );
 
-    vos::OGuard aGuard2( aMutex );
+    osl::MutexGuard aGuard2( aMutex );
     if( !sDesc.getLength() )
         sDesc = GetDescription();
 
@@ -1146,7 +1146,7 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition()
 
     sal_Int32 nRet = GetCaretPos();
     {
-        vos::OGuard aOldCaretPosGuard( aMutex );
+        osl::MutexGuard aOldCaretPosGuard( aMutex );
         ASSERT( nRet == nOldCaretPos, "caret pos out of sync" );
         nOldCaretPos = nRet;
     }
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 1a69a1a37aef..70e3a246fdc4 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <rtl/uuid.h>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 99a5556777d6..4383c1f7dfdc 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -31,7 +31,7 @@
 
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <rtl/uuid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>