migrate vos::OModule to osl:Module

3 files changed, 9 insertions, 10 deletions

diff --git a/binfilter/bf_sc/source/core/tool/sc_callform.cxx b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
index 738f828f6..294db281d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_callform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
@@ -32,7 +32,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 
 #include "adiasync.hxx"
 #include <tools/debug.hxx>
@@ -150,15 +150,15 @@ class ModuleData : public DataObject
 {
     friend class ModuleCollection;
     String      aName;
-    vos::OModule*  pInstance;
+    osl::Module* pInstance;
 public:
-    ModuleData(const String& rStr, vos::OModule* pInst) : aName (rStr), pInstance (pInst) {}
-    ModuleData(const ModuleData& rData) : aName (rData.aName) {pInstance = new vos::OModule(aName);}
+    ModuleData(const String& rStr, osl::Module* pInst) : aName (rStr), pInstance (pInst) {}
+    ModuleData(const ModuleData& rData) : aName (rData.aName) {pInstance = new osl::Module(aName);}
     ~ModuleData() { delete pInstance; }
     virtual DataObject* Clone() const { return new ModuleData(*this); }
 
     const   String&         GetName() const { return aName; }
-    vos::OModule*           GetInstance() const { return pInstance; }
+    osl::Module*            GetInstance() const { return pInstance; }
     void            FreeInstance() { delete pInstance; pInstance = 0; }
 };
 
@@ -210,7 +210,7 @@ public:
 /*N*/ BOOL FuncData::Call(void** ppParam)
 /*N*/ {
 /*N*/ 	BOOL bRet = FALSE;
-        vos::OModule* pLib = pModuleData->GetInstance();
+        osl::Module* pLib = pModuleData->GetInstance();
 /*N*/ 	FARPROC fProc = (FARPROC)pLib->getSymbol(aFuncName);
 /*N*/ 	if (fProc != NULL)
 /*N*/ 	{
diff --git a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
index 7e00980f7..034087e19 100644
--- a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
+++ b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
@@ -30,7 +30,7 @@
 
 #include <tools/debug.hxx>
 #include <osl/file.hxx>
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 #include <bf_svtools/pathoptions.hxx>
 #include <bf_sfx2/docfile.hxx>
 #include <bf_sfx2/progress.hxx>
diff --git a/binfilter/bf_so3/source/inplace/outplace.cxx b/binfilter/bf_so3/source/inplace/outplace.cxx
index 679ee7436..09924cf12 100644
--- a/binfilter/bf_so3/source/inplace/outplace.cxx
+++ b/binfilter/bf_so3/source/inplace/outplace.cxx
@@ -51,7 +51,7 @@
 #include "insdlg.hxx"
 #include "bf_so3/outplace.hxx"
 #include <viscache.hxx>
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 #include <sot/formats.hxx>
 #include <bf_svtools/filter.hxx>
 #include <comphelper/classids.hxx>
@@ -60,7 +60,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <bf_svtools/wmf.hxx>
 
-using namespace vos;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::datatransfer;
 
@@ -636,7 +635,7 @@ SvInPlaceObjectRef SvOutPlaceObject::InsertObject
     io.dwFlags=IOF_SELECTCREATENEW | IOF_DISABLELINK;
     io.clsid = rName.GetCLSID();
 
-    OModule aOleDlgLib;
+    osl::Module aOleDlgLib;
     if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) )
         return &xRet;