remvove vos/macros.h usage

14 files changed, 3 insertions, 23 deletions

diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index a4a45b052633..dceed4c48b40 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -539,7 +539,6 @@
 
 #include "vcl/fldunit.hxx"
 
-#include "vos/macros.hxx"
 #include "osl/module.hxx"
 #include "osl/mutex.hxx"
 
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 46438a8a85bb..cae9ecb5caa3 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -66,7 +66,6 @@
 #include "unoobjw.hxx"
 #include "servprov.hxx"
 
-using namespace vos;
 using namespace std;
 using namespace rtl;
 using namespace osl;
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx
index 0a68f413e60e..0fc3691a47dc 100644
--- a/extensions/test/sax/testsax.cxx
+++ b/extensions/test/sax/testsax.cxx
@@ -52,7 +52,6 @@
 #include "factory.hxx"
 
 using namespace rtl;
-using namespace vos;
 using namespace usr;
 
 
diff --git a/extensions/test/sax/testwriter.cxx b/extensions/test/sax/testwriter.cxx
index a3e711599973..692dcb1647ad 100644
--- a/extensions/test/sax/testwriter.cxx
+++ b/extensions/test/sax/testwriter.cxx
@@ -52,7 +52,6 @@
 
 using namespace std;
 using namespace rtl;
-using namespace vos;
 using namespace usr;
 
 #define BUILD_ERROR(expr, Message)\
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index 1611458394c0..6886f99f8b31 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -55,7 +55,6 @@
 #include "testfactreg.hxx"
 
 #ifndef _VOS_NO_NAMESPACE
-using namespace vos;
 using namespace usr;
 #endif
 
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 260b38a027a1..3043d119c122 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -52,7 +52,6 @@
 
 
 #ifndef _VOS_NO_NAMESPACE
-using namespace vos;
 using namespace usr;
 #endif
 
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index 705152f38939..cf74aa2f33c0 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/test/stm/pipetest.cxx
@@ -50,7 +50,6 @@
 #define SERVICE_NAME        L"test.com.sun.star.io.Pipe"
 
 #ifndef _VOS_NO_NAMESPACE
-using namespace vos;
 using namespace usr;
 #endif
 
diff --git a/extensions/test/stm/testfactreg.cxx b/extensions/test/stm/testfactreg.cxx
index 2cd29f61e53b..9c9e1c050a6c 100644
--- a/extensions/test/stm/testfactreg.cxx
+++ b/extensions/test/stm/testfactreg.cxx
@@ -37,7 +37,6 @@
 
 
 #ifndef _VOS_NO_NAMESPACE
-using namespace vos;
 using namespace usr;
 #endif
 
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx
index 930e8395442f..aab403885835 100644
--- a/extensions/workben/pythonautotest.cxx
+++ b/extensions/workben/pythonautotest.cxx
@@ -34,7 +34,6 @@
 #include <stardiv/uno/beans/exactname.hxx>
 
 #include <rtl/ustring.hxx>
-#include <vos/dynload.hxx>
 #include <osl/diagnose.h>
 #include <usr/services.hxx>
 #include <vcl/svapp.hxx>
@@ -44,7 +43,6 @@
 #include <osl/conditn.hxx>
 
 using namespace rtl;
-using namespace vos;
 using namespace usr;
 
 #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM)
diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx
index 49ab2438d45f..dfb3fa3e0019 100644
--- a/extensions/workben/pythontest.cxx
+++ b/extensions/workben/pythontest.cxx
@@ -35,7 +35,6 @@
 #include <stardiv/uno/beans/exactname.hxx>
 
 #include <rtl/ustring.hxx>
-#include <vos/dynload.hxx>
 #include <osl/diagnose.h>
 #include <usr/services.hxx>
 #include <vcl/svapp.hxx>
@@ -45,7 +44,6 @@
 #include <osl/conditn.hxx>
 
 using namespace rtl;
-using namespace vos;
 using namespace usr;
 
 #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM)
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index a34dfc615566..705d451da5be 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -41,7 +41,6 @@
 #include <smart/com/sun/star/registry/XImplementationRegistration.hxx>
 #include <smart/com/sun/star/lang/XComponent.hxx>
 
-#include <vos/dynload.hxx>
 #include <osl/diagnose.h>
 #include <usr/services.hxx>
 #include <vcl/svapp.hxx>
@@ -52,7 +51,6 @@
 #include <smart/com/sun/star/test/XSimpleTest.hxx>
 
 using namespace rtl;
-using namespace vos;
 using namespace usr;
 
 
diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx
index 65000486382b..11025e604648 100644
--- a/extensions/workben/testframecontrol.cxx
+++ b/extensions/workben/testframecontrol.cxx
@@ -29,8 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
-#include <vos/dynload.hxx>
-
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 
@@ -45,7 +43,6 @@
 
 #include <svtools/unoiface.hxx>
 
-using namespace vos;
 using namespace usr;
 
 //==================================================================================================
diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx
index 84318ad6301c..6027a68e4d70 100644
--- a/extensions/workben/testpgp.cxx
+++ b/extensions/workben/testpgp.cxx
@@ -33,7 +33,6 @@
 #ifndef _RTL_WSTRING_
 #include <rtl/wstring>
 #endif
-#include <vos/macros.hxx>
 
 #include <usr/smartservices.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -282,7 +281,7 @@ sal_Int32 SAL_CALL DataSource_Impl::readBytes (
         throw IOException();
 
     sal_Int32 k = m_buffer.getLength() - m_position;
-    k = VOS_BOUND(k, 0, nBytesToRead);
+    k = SAL_BOUND(k, 0, nBytesToRead);
     if (k > 0)
     {
         rData.realloc(k);
@@ -554,7 +553,7 @@ BOOL install (
     String aModule ("module://");
     char   pBuffer[1024];
 
-    NAMESPACE_VOS(ORealDynamicLoader)::computeModuleName (
+    vos:ORealDynamicLoader::computeModuleName (
         prefix, pBuffer, sizeof(pBuffer));
     aModule += pBuffer;
 
@@ -572,7 +571,7 @@ BOOL uninstall (
     String aModule ("module://");
     char   pBuffer[1024];
 
-    NAMESPACE_VOS(ORealDynamicLoader)::computeModuleName (
+    vos::ORealDynamicLoader::computeModuleName (
         prefix, pBuffer, sizeof(pBuffer));
     aModule += pBuffer;
 
diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx
index 9a532a78b76f..069f33c631b7 100644
--- a/extensions/workben/testresource.cxx
+++ b/extensions/workben/testresource.cxx
@@ -33,13 +33,11 @@
 #include <smart/com/sun/star/script/XInvocation.hxx>
 
 #include <rtl/ustring.hxx>
-#include <vos/dynload.hxx>
 #include <osl/diagnose.h>
 #include <usr/services.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace rtl;
-using namespace vos;
 using namespace usr;
 
 class MyApp : public Application