merge vosremoval-mutex.diff

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

8 files changed, 13 insertions, 14 deletions

diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx
index e142013b0ea5..2d8d42942c99 100644
--- a/svl/inc/pch/precompiled_svl.hxx
+++ b/svl/inc/pch/precompiled_svl.hxx
@@ -421,7 +421,7 @@
 #include <unotools/processfactory.hxx>
 
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vos/process.hxx>
 #include <vos/security.hxx>
 #include <vos/thread.hxx>
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 8a23e08aef62..14b95906ddd1 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <svl/smplhint.hxx>
 #include <rtl/instance.hxx>
 #include <unotools/syslocale.hxx>
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index fc6db651a314..5d9cb63c6fef 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -33,7 +33,7 @@
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <i18npool/mslangid.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
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 )
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 97b59d2c6414..cf026acb8a71 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -32,7 +32,7 @@
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <i18npool/mslangid.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
 #include <com/sun/star/util/Date.hpp>
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 86b055680c4a..da0ec77ed7cc 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -33,7 +33,7 @@
 
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/uuid.h>
 
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 9b3275b9ed9f..909a141e018f 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -33,7 +33,7 @@
 #include <comphelper/sharedmutex.hxx>
 #include <i18npool/mslangid.hxx>
 #include <tools/debug.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <tools/stream.hxx>
 #include <strmadpt.hxx>
 #include "instrm.hxx"
@@ -43,7 +43,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
-using namespace ::vos;
 using namespace ::utl;
 
 #define PERSISTENT_SERVICE_NAME     ::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier");
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index ab9c15edec6c..0dc3196250f3 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -37,7 +37,7 @@
 #include <osl/thread.h>
 #include <tools/debug.hxx>
 #include <tools/solarmutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 // static DWORD        hDdeInst  = NULL;
 // static short        nInstance = 0;