10 files changed, 15 insertions, 15 deletions
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index 2a8512848ef0..f60ccc74afb8 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -30,7 +30,7 @@
 
 #include <tools/list.hxx>
 #include <vcl/timer.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <scdllapi.h>
 
 #define SC_REFRESHTIMER_CONTROL_LIST 0
@@ -42,8 +42,8 @@ DECLARE_LIST( ScRefreshTimerList, ScRefreshTimer* )
 class ScRefreshTimerControl
 {
 private:
-            ::vos::OMutex       aMutex;
-            USHORT              nBlockRefresh;
+    ::osl::Mutex   aMutex;
+    USHORT         nBlockRefresh;
 
 public:
 #if SC_REFRESHTIMER_CONTROL_LIST
@@ -60,7 +60,7 @@ public:
                                             ++nBlockRefresh;
                                     }
             BOOL                IsRefreshAllowed() const    { return !nBlockRefresh; }
-            ::vos::OMutex&      GetMutex()                  { return aMutex; }
+            ::osl::Mutex&       GetMutex()                  { return aMutex; }
 };
 
 
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 89e2274bc660..cb022714fe93 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -770,7 +770,7 @@ void ScDocument::RemoveUnoObject( SfxListener& rObject )
             //  This check is done after calling EndListening, so a later BroadcastUno call
             //  won't touch this object.
 
-            vos::IMutex& rSolarMutex = Application::GetSolarMutex();
+            osl::SolarMutex& rSolarMutex = Application::GetSolarMutex();
             if ( rSolarMutex.tryToAcquire() )
             {
                 //  BroadcastUno is always called with the SolarMutex locked, so if it
diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx
index a5c2e24f6082..e12916a9f907 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -42,7 +42,7 @@ ScRefreshTimerProtector::ScRefreshTimerProtector( ScRefreshTimerControl * const
     {
         (*ppControl)->SetAllowRefresh( FALSE );
         // wait for any running refresh in another thread to finnish
-        ::vos::OGuard aGuard( (*ppControl)->GetMutex() );
+        ::osl::MutexGuard aGuard( (*ppControl)->GetMutex() );
     }
 }
 
@@ -71,7 +71,7 @@ void ScRefreshTimer::Timeout()
     if ( ppControl && *ppControl && (*ppControl)->IsRefreshAllowed() )
     {
         // now we COULD make the call in another thread ...
-        ::vos::OGuard aGuard( (*ppControl)->GetMutex() );
+        ::osl::MutexGuard aGuard( (*ppControl)->GetMutex() );
         maTimeoutHdl.Call( this );
         // restart from now on, don't execute immediately again if timed out
         // a second time during refresh
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index a07998578f78..d5aad61a6054 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 #include "lotimpop.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 #include "attrib.hxx"
 #include "document.hxx"
@@ -49,7 +49,7 @@
 #include "lotattr.hxx"
 
 
-static NAMESPACE_VOS( OMutex )      aLotImpSemaphore;
+static osl::Mutex aLotImpSemaphore;
 
 
 ImportLotus::ImportLotus( SvStream& aStream, ScDocument* pDoc, CharSet eQ ) :
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index fed861eaf961..cba682688f1f 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -61,7 +61,7 @@
 #include <svl/itempool.hxx>
 #include <svl/urlbmk.hxx>
 #include <tools/urlobj.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 #include "drwtrans.hxx"
 #include "docsh.hxx"
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index f23bb936c1a5..906a0f3e150a 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -47,7 +47,7 @@
 #include <sot/storage.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index 0085d01435a8..4a8e3cf2f846 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index c59ee14f0c5d..5b9dcc5d6180 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -65,7 +65,7 @@
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <sot/storinfo.hxx>
diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx
index 3c7a7c0f571b..0350546cce2a 100644
--- a/sc/source/ui/unoobj/unodoc.cxx
+++ b/sc/source/ui/unoobj/unodoc.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include "scmod.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include "docsh.hxx"
diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx
index 190b70569c36..9c724e0da871 100644
--- a/sc/workben/addin.cxx
+++ b/sc/workben/addin.cxx
@@ -33,7 +33,7 @@
 #include <usr/factoryhlp.hxx>
 #include <usr/macros.hxx>
 #include <usr/reflserv.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 #include <tools/date.hxx>