migrate vos::OModule to osl:Module

5 files changed, 8 insertions, 9 deletions

diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 498599a6bb04..ab61423b9314 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -39,7 +39,6 @@
 #include <iderdll.hxx>
 #include <basdoc.hxx>
 
-using namespace ::vos;
 using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::std;
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index 8ffb20deed9e..a4a45b052633 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -540,7 +540,7 @@
 #include "vcl/fldunit.hxx"
 
 #include "vos/macros.hxx"
-#include "vos/module.hxx"
+#include "osl/module.hxx"
 #include "osl/mutex.hxx"
 
 #include "xmloff/nmspmap.hxx"
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 8e449d906654..457be67d0f9b 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -43,7 +43,7 @@
 #include <tools/svwin.h>
 #include <tools/stream.hxx>
 #include <osl/mutex.hxx>
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/sysdata.hxx>
@@ -110,7 +110,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
     TW_IDENTITY                                 aSrcIdent;
     Link                                        aNotifyLink;
     DSMENTRYPROC                                pDSM;
-    NAMESPACE_VOS(OModule )*                    pMod;
+    osl::Module*                                pMod;
     ULONG                                       nCurState;
     HWND                                        hTwainWnd;
     HHOOK                                       hTwainHook;
@@ -293,7 +293,7 @@ void ImpTwain::ImplOpenSourceManager()
 {
     if( 1 == nCurState )
     {
-        pMod = new ::vos::OModule( ::rtl::OUString() );
+        pMod = new ::osl::Module( ::rtl::OUString() );
 
         if( pMod->load( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( TWAIN_LIBNAME ) ) ) )
         {
diff --git a/extensions/source/scanner/twain.cxx b/extensions/source/scanner/twain.cxx
index d091fa46028a..2b6647e4e7d6 100644
--- a/extensions/source/scanner/twain.cxx
+++ b/extensions/source/scanner/twain.cxx
@@ -38,7 +38,7 @@
 #ifdef OS2
 #include <svpm.h>
 #endif // OS2
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
@@ -243,7 +243,7 @@ void ImpTwain::ImplOpenSourceManager()
 {
     if( 1 == nCurState )
     {
-        pMod = new NAMESPACE_VOS( OModule )();
+        pMod = new osl::Module();
 
         if( pMod->load( TWAIN_LIBNAME ) )
         {
diff --git a/extensions/source/scanner/twain.hxx b/extensions/source/scanner/twain.hxx
index 7599f86d7813..d5f4a30290b7 100644
--- a/extensions/source/scanner/twain.hxx
+++ b/extensions/source/scanner/twain.hxx
@@ -28,7 +28,7 @@
 #ifndef _TWAIN_HXX
 #define _TWAIN_HXX
 
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 #include <vcl/bitmap.hxx>
 #include "twain/twain.h"
 
@@ -57,7 +57,7 @@ class ImpTwain
     Link                        aNotifyLink;
     Bitmap                      aBitmap;
     DSMENTRYPROC                pDSM;
-    NAMESPACE_VOS( OModule )*   pMod;
+    osl::Module                 pMod;
     ULONG                       nCurState;
 
     void                        ImplCreate();