merge vosremoval-mutex.diff

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

6 files changed, 14 insertions, 15 deletions

diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index 7769a1fb2f5c..eacfc86d3b1b 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -277,7 +277,7 @@
 
 #include "osl/diagnose.h"
 #include "vos/macros.hxx"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
 #include "vos/process.hxx"
 
 #include "xmlscript/xmldlg_imexp.hxx"
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 32d6ba279ac4..4cebf35be0c7 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -53,7 +53,7 @@
 #include "filefmt.hxx"
 #include "sb.hrc"
 #include <basrid.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include "errobject.hxx"
 #include <hash_map>
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index e22cb142f0ca..876513216205 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basic.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/errcode.hxx>
 #include <svl/hint.hxx>
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index fa8e5604a54f..2384ee0d1e3c 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -51,7 +51,7 @@
 #include <svtools/syntaxhighlight.hxx>
 
 #include <basic/basrdll.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <basic/sbobjmod.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 0cbab9ec2a0f..40cf7f2f3ece 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -36,7 +36,7 @@
 #include <osl/security.h>
 #include <osl/file.hxx>
 #include <tools/urlobj.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 #include "runtime.hxx"
 
@@ -67,7 +67,6 @@
 #include <com/sun/star/bridge/XBridgeFactory.hpp>
 
 using namespace comphelper;
-using namespace osl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ucb;
@@ -344,7 +343,7 @@ BOOL hasUno( void )
 
 class OslStream : public SvStream
 {
-    File maFile;
+    osl::File maFile;
     short mnStrmMode;
 
 public:
@@ -376,14 +375,14 @@ OslStream::OslStream( const String& rName, short nStrmMode )
         nFlags = OpenFlag_Read;
     }
 
-    FileBase::RC nRet = maFile.open( nFlags );
-    if( nRet == FileBase::E_NOENT && nFlags != OpenFlag_Read )
+    osl::FileBase::RC nRet = maFile.open( nFlags );
+    if( nRet == osl::FileBase::E_NOENT && nFlags != OpenFlag_Read )
     {
         nFlags |= OpenFlag_Create;
         nRet = maFile.open( nFlags );
     }
 
-    if( nRet != FileBase::E_None )
+    if( nRet != osl::FileBase::E_None )
     {
         SetError( ERRCODE_IO_GENERAL );
     }
@@ -398,7 +397,7 @@ OslStream::~OslStream()
 ULONG OslStream::GetData( void* pData, ULONG nSize )
 {
     sal_uInt64 nBytesRead = nSize;
-    FileBase::RC nRet = FileBase::E_None;
+    osl::FileBase::RC nRet = osl::FileBase::E_None;
     nRet = maFile.read( pData, nBytesRead, nBytesRead );
     return (ULONG)nBytesRead;
 }
@@ -406,14 +405,14 @@ ULONG OslStream::GetData( void* pData, ULONG nSize )
 ULONG OslStream::PutData( const void* pData, ULONG nSize )
 {
     sal_uInt64 nBytesWritten;
-    FileBase::RC nRet = FileBase::E_None;
+    osl::FileBase::RC nRet = osl::FileBase::E_None;
     nRet = maFile.write( pData, (sal_uInt64)nSize, nBytesWritten );
     return (ULONG)nBytesWritten;
 }
 
 ULONG OslStream::SeekPos( ULONG nPos )
 {
-    FileBase::RC nRet;
+    osl::FileBase::RC nRet;
     if( nPos == STREAM_SEEK_TO_END )
     {
         nRet = maFile.setPos( Pos_End, 0 );
@@ -433,7 +432,7 @@ void OslStream::FlushData()
 
 void OslStream::SetSize( ULONG nSize )
 {
-    FileBase::RC nRet = FileBase::E_None;
+    osl::FileBase::RC nRet = osl::FileBase::E_None;
     nRet = maFile.setSize( (sal_uInt64)nSize );
 }
 
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index cf74f128737f..e2321c90e1fc 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #ifndef __RSC //autogen
 #include <tools/errinf.hxx>
 #endif