diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 75a153b..622f98b 100644
--- basctl/source/basicide/unomodel.cxx
+++ basctl/source/basicide/unomodel.cxx
@@ -51,7 +51,6 @@
 #include <iderdll.hxx>
 #include <basdoc.hxx>
 
-using namespace ::vos;
 using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::std;
diff --git a/binfilter/bf_sc/source/core/tool/sc_callform.cxx b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
index a5815be..e393e19 100644
--- binfilter/bf_sc/source/core/tool/sc_callform.cxx
+++ binfilter/bf_sc/source/core/tool/sc_callform.cxx
@@ -40,16 +40,14 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#ifndef _VOS_MODULE_HXX_
-#include <vos/module.hxx>
+#ifndef _OSL_MODULE_HXX_
+#include <osl/module.hxx>
 #endif
 
 #include "adiasync.hxx"
 #include <tools/debug.hxx>
 namespace binfilter {
 
-using namespace ::vos;
-
 //------------------------------------------------------------------------
 
 extern "C" {
@@ -161,15 +159,15 @@ typedef void (CALLTYPE* FARPROC) ( void );
 /*N*/ {
 /*N*/ friend class ModuleCollection;
 /*N*/ 	String		aName;
-/*N*/ 	OModule*	pInstance;
+/*N*/ 	osl::Module*	pInstance;
 /*N*/ public:
-/*N*/ 	ModuleData(const String& rStr, OModule* pInst) : aName (rStr), pInstance (pInst) {}
-/*N*/ 	ModuleData(const ModuleData& rData) : aName (rData.aName) {pInstance = new OModule(aName);}
+/*N*/ 	ModuleData(const String& rStr, osl::Module* pInst) : aName (rStr), pInstance (pInst) {}
+/*N*/ 	ModuleData(const ModuleData& rData) : aName (rData.aName) {pInstance = new osl::Module(aName);}
 /*N*/ 	~ModuleData() { delete pInstance; }
 /*N*/ 	virtual DataObject*	Clone() const { return new ModuleData(*this); }
 /*N*/ 
 /*N*/ 	const   String&			GetName() const { return aName; }
-/*N*/ 			OModule*		GetInstance() const { return pInstance; }
+/*N*/ 			osl::Module*		GetInstance() const { return pInstance; }
 /*N*/ 			void			FreeInstance() { delete pInstance; pInstance = 0; }
 /*N*/ };
 
@@ -217,7 +215,7 @@ typedef void (CALLTYPE* FARPROC) ( void );
 /*N*/ BOOL FuncData::Call(void** ppParam)
 /*N*/ {
 /*N*/ 	BOOL bRet = FALSE;
-/*N*/ 	OModule* pLib = pModuleData->GetInstance();
+/*N*/ 	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 e007b24..5326ff2 100644
--- binfilter/bf_sd/source/filter/sd_sdfilter.cxx
+++ binfilter/bf_sd/source/filter/sd_sdfilter.cxx
@@ -39,7 +39,7 @@
 
 #include <tools/debug.hxx>
 #include <osl/file.hxx>
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 #include <svtools/pathoptions.hxx>
 #include <bf_sfx2/docfile.hxx>
 #include <bf_sfx2/progress.hxx>
@@ -106,11 +106,11 @@ SdFilter::~SdFilter()
 
 // -----------------------------------------------------------------------------
 
-::vos::OModule* SdFilter::OpenLibrary( const ::rtl::OUString& rLibraryName ) const
+::osl::Module* SdFilter::OpenLibrary( const ::rtl::OUString& rLibraryName ) const
 {
 	::rtl::OUString	aDest;
 	::rtl::OUString	aNormalizedPath;
-	::vos::OModule*	pRet;
+	::osl::Module*	pRet;
 	
     if ( ::osl::FileBase::getFileURLFromSystemPath( SvtPathOptions().GetFilterPath(), aDest ) != ::osl::FileBase::E_None )
         aDest = SvtPathOptions().GetFilterPath();
@@ -118,7 +118,7 @@ SdFilter::~SdFilter()
 	aDest += ::rtl::OUString( ImplGetFullLibraryName( rLibraryName ) );
 	::osl::FileBase::getSystemPathFromFileURL( aDest, aNormalizedPath );
 
-	if( !( pRet = new ::vos::OModule( aNormalizedPath ) )->isLoaded() )
+	if( !( pRet = new ::osl::Module( aNormalizedPath ) )->is() )
 		delete pRet, pRet = NULL;
 
 	return pRet;
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unovwcrs.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unovwcrs.cxx
index 52ca4f3..b3531f5 100644
--- binfilter/bf_sd/source/ui/unoidl/sd_unovwcrs.cxx
+++ binfilter/bf_sd/source/ui/unoidl/sd_unovwcrs.cxx
@@ -48,7 +48,6 @@
 #include <cppuhelper/implbase2.hxx>
 namespace binfilter {
 
-using namespace ::vos;
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
index 761e05d..5b5c016 100644
--- binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
+++ binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx
@@ -123,7 +123,6 @@
 #include <legacysmgr/legacy_binfilters_smgr.hxx>	//STRIP002 
 #endif
 
-using namespace ::vos;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::beans;
diff --git a/binfilter/bf_starmath/source/starmath_unomodel.cxx b/binfilter/bf_starmath/source/starmath_unomodel.cxx
index e567cf7..3f12fb9 100644
--- binfilter/bf_starmath/source/starmath_unomodel.cxx
+++ binfilter/bf_starmath/source/starmath_unomodel.cxx
@@ -118,7 +118,6 @@
 #endif
 
 namespace binfilter {
-using namespace ::vos;
 using namespace ::rtl;
 using namespace ::cppu;
 using namespace ::std;
diff --git a/binfilter/inc/bf_sd/sdfilter.hxx b/binfilter/inc/bf_sd/sdfilter.hxx
index 36d6dae..c27e70d 100644
--- binfilter/inc/bf_sd/sdfilter.hxx
+++ binfilter/inc/bf_sd/sdfilter.hxx
@@ -44,7 +44,7 @@
 #ifndef _COM_SUN_STAR_TASK_XSTATUSINDICATORSUPPLIER_HPP_
 #include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
 #endif
-namespace vos { class OModule; }
+namespace osl { class Module; }
 namespace binfilter {
 
 // ------------
@@ -76,7 +76,7 @@ protected:
 	sal_Bool					mbIsDraw : 1;
 	sal_Bool					mbShowProgress : 1;
 
-	::vos::OModule*				OpenLibrary( const ::rtl::OUString& rLibraryName ) const;
+	::osl::Module*				OpenLibrary( const ::rtl::OUString& rLibraryName ) const;
 	void						CreateStatusIndicator();
 	void						CreateProgress();
 
diff --git a/binfilter/inc/bf_sfx2/docfac.hxx b/binfilter/inc/bf_sfx2/docfac.hxx
index 9f15adb..39cc442 100644
--- binfilter/inc/bf_sfx2/docfac.hxx
+++ binfilter/inc/bf_sfx2/docfac.hxx
@@ -47,8 +47,8 @@
 #endif
 
 // SFX_IMPL_MODULE_LIB
-#ifndef _VOS_MODULE_HXX_
-#include <vos/module.hxx>
+#ifndef _OSL_MODULE_HXX_
+#include <osl/module.hxx>
 #endif
 #ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
@@ -365,12 +365,12 @@ extern "C"
 
 #define SFX_IMPL_MODULE_LIB( LibName, LibString )					\
 	void * GetFunc##LibName( const char * pFuncName );				\
-	static ::vos::OModule* pLibHandle##LibName = NULL; 				\
+	static ::osl::Module* pLibHandle##LibName = NULL; 				\
 	BOOL __EXPORT LoadLib##LibName()   								\
 	{																\
 		if( pLibHandle##LibName == NULL )							\
 		{															\
-			pLibHandle##LibName = new ::vos::OModule();				\
+			pLibHandle##LibName = new ::osl::Module();				\
 			So2VoidFunc_TYPE fFunc;									\
 			if (!pLibHandle##LibName->load( LibString )) 			\
 				return FALSE;										\
@@ -378,11 +378,11 @@ extern "C"
 			if( fFunc )												\
 				(*fFunc)();											\
 		}															\
-		return pLibHandle##LibName->isLoaded();						\
+		return pLibHandle##LibName->is();							\
 	}																\
 	void __EXPORT FreeLib##LibName()								\
 	{																\
-		if( pLibHandle##LibName && pLibHandle##LibName->isLoaded() )\
+		if( pLibHandle##LibName && pLibHandle##LibName->is() )		\
 		{															\
 			So2VoidFunc_TYPE fFunc;									\
 			fFunc = (So2VoidFunc_TYPE)GetFunc##LibName("DeInit" #LibName "Dll");\
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 491a440..140cab8 100644
--- embeddedobj/source/msole/xdialogcreator.cxx
+++ embeddedobj/source/msole/xdialogcreator.cxx
@@ -61,7 +61,7 @@
 
 #include <osl/thread.h>
 #include <osl/file.hxx>
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 #include <comphelper/classids.hxx>
 
 #include "platform.h"
@@ -206,7 +206,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
 	io.dwFlags = IOF_SELECTCREATENEW | IOF_DISABLELINK;
 
 
-	::vos::OModule aOleDlgLib;
+	::osl::Module aOleDlgLib;
 	if( !aOleDlgLib.load( ::rtl::OUString::createFromAscii( "oledlg" ) ) )
 		throw uno::RuntimeException();
 
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index c531290..8be503a 100644
--- extensions/inc/pch/precompiled_extensions.hxx
+++ extensions/inc/pch/precompiled_extensions.hxx
@@ -546,7 +546,7 @@
 #include "osl/conditn.hxx"
 #include "osl/diagnose.h"
 #include "sal/macros.h"
-#include "vos/module.hxx"
+#include "osl/module.hxx"
 #include "osl/mutex.hxx"
 #include "vos/pipe.hxx"
 #include "rtl/ref.hxx"
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index cfa1f64..2744549 100644
--- extensions/source/scanner/scanwin.cxx
+++ extensions/source/scanner/scanwin.cxx
@@ -80,7 +80,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>
@@ -143,7 +143,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
 	TW_IDENTITY									aSrcIdent;
 	Link										aNotifyLink;
 	DSMENTRYPROC								pDSM;
-	vos::OModule*					pMod;
+	osl::Module*					pMod;
 	ULONG										nCurState;
 	HWND						                hTwainWnd;
 	HHOOK						                hTwainHook;
@@ -326,7 +326,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 27988f9..b2a1cbb 100644
--- extensions/source/scanner/twain.cxx
+++ extensions/source/scanner/twain.cxx
@@ -45,7 +45,7 @@
 #ifdef OS2
 #include <tools/svpm.h>
 #endif // OS2
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
@@ -250,7 +250,7 @@ void ImpTwain::ImplOpenSourceManager()
 {
 	if( 1 == nCurState )
 	{
-		pMod = new 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 7b8dbdd..3036735 100644
--- extensions/source/scanner/twain.hxx
+++ extensions/source/scanner/twain.hxx
@@ -36,7 +36,7 @@
 #ifndef _TWAIN_HXX
 #define _TWAIN_HXX
 
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 #include <vcl/bitmap.hxx>
 #include "twain/twain.h"
 
@@ -65,7 +65,7 @@ class ImpTwain
 	Link						aNotifyLink;
 	Bitmap						aBitmap;
 	DSMENTRYPROC				pDSM;
-	vos::OModule*	pMod;
+	osl::Module*	pMod;
 	ULONG						nCurState;
 
 	void						ImplCreate();
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index aca4622..9290435 100644
--- sd/inc/pch/precompiled_sd.hxx
+++ sd/inc/pch/precompiled_sd.hxx
@@ -919,7 +919,7 @@
 #include "vcl/wrkwin.hxx"
 
 #include "osl/diagnose.h"
-#include "vos/module.hxx"
+#include "osl/module.hxx"
 #include "osl/mutex.hxx"
 #include "osl/thread.hxx"
 //---MARKER---
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 729247f..88aae88 100644
--- sd/source/filter/html/HtmlOptionsDialog.cxx
+++ sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -39,8 +39,8 @@
 #ifndef _OSL_FILE_HXX_
 #include <osl/file.hxx>
 #endif
-#ifndef _VOS_MODULE_HXX_
-#include <vos/module.hxx>
+#ifndef _OSL_MODULE_HXX_
+#include <osl/module.hxx>
 #endif
 
 #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index c2a233d..e62b633 100644
--- sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -57,7 +57,6 @@
 #endif
 
 using ::rtl::OUString;
-using namespace ::vos;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 54afe37..94de398 100644
--- sfx2/inc/pch/precompiled_sfx2.hxx
+++ sfx2/inc/pch/precompiled_sfx2.hxx
@@ -671,7 +671,7 @@
 #include "vcl/unohelp.hxx"
 #include "vcl/wintypes.hxx"
 #include "osl/diagnose.h"
-#include "vos/module.hxx"
+#include "osl/module.hxx"
 #include "osl/mutex.hxx"
 #include "vos/security.hxx"
 #include "vos/socket.hxx"
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index 3a932da..495e7c6 100644
--- sfx2/inc/sfx2/docfac.hxx
+++ sfx2/inc/sfx2/docfac.hxx
@@ -55,8 +55,8 @@
 #endif
 
 // SFX_IMPL_MODULE_LIB
-#ifndef _VOS_MODULE_HXX_
-#include <vos/module.hxx>
+#ifndef _OSL_MODULE_HXX_
+#include <osl/module.hxx>
 #endif
 #ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 4ea4a18..b16db09 100644
--- sfx2/source/appl/appmisc.cxx
+++ sfx2/source/appl/appmisc.cxx
@@ -132,7 +132,6 @@
 #include <sfx2/objface.hxx>
 #include "helper.hxx"	// SfxContentHelper::Kill()
 
-using namespace ::vos;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::beans;
diff --git a/so3/source/inplace/outplace.cxx b/so3/source/inplace/outplace.cxx
index f6c2511..a0772f1 100644
--- so3/source/inplace/outplace.cxx
+++ so3/source/inplace/outplace.cxx
@@ -65,7 +65,7 @@
 #include <insdlg.hxx>
 #include <outplace.hxx>
 #include <viscache.hxx>
-#include <vos/module.hxx>
+#include <osl/module.hxx>
 #include <sot/formats.hxx>
 #include <svtools/filter.hxx>
 #include <sot/clsids.hxx>
@@ -80,7 +80,6 @@
 #endif
 #include <svtools/wmf.hxx>
 
-using namespace vos;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::datatransfer;
 
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 97ca0a9..a8dd856 100644
--- starmath/source/unomodel.cxx
+++ starmath/source/unomodel.cxx
@@ -117,7 +117,6 @@
 
 #include <smdll.hxx>
 
-using namespace ::vos;
 using namespace ::cppu;
 using namespace ::std;
 using namespace ::comphelper;
diff --git a/svx/source/msfilter/msdffimp.cxx b/svx/source/msfilter/msdffimp.cxx
index e149827..586e8c5 100644
--- svx/source/msfilter/msdffimp.cxx
+++ svx/source/msfilter/msdffimp.cxx
@@ -344,9 +344,6 @@
 #ifndef _UCBHELPER_CONTENTBROKER_HXX_
 #include <ucbhelper/contentbroker.hxx>
 #endif
-#ifndef _VOS_NO_NAMESPACE
-using namespace vos;
-#endif
 
 #ifndef _ENHANCED_CUSTOMSHAPE_TYPE_NAMES_HXX
 #include "../customshapes/EnhancedCustomShapeTypeNames.hxx"
diff --git a/vos/inc/vos/module.hxx b/vos/inc/vos/module.hxx
deleted file mode 100644
index 3858886..0000000
--- vos/inc/vos/module.hxx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: module.hxx,v $
- *
- *  $Revision: 1.6 $
- *
- *  last change: $Author: vg $ $Date: 2006/06/02 12:37:08 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
- *
- *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
- *
- ************************************************************************/
-
-
-#ifndef _VOS_MODULE_HXX_
-#define _VOS_MODULE_HXX_
-
-#ifndef _VOS_OBJECT_HXX_
-#   include <vos/object.hxx>
-#endif
-#ifndef _RTL_USTRING_HXX_
-#   include <rtl/ustring.hxx>
-#endif
-#ifndef _OSL_MODULE_H_
-#   include <osl/module.h>
-#endif
-
-namespace vos
-{
-
-class OModule : public OObject
-{
-    VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OModule, vos));
-
-public:
-
-    /// default c'tor
-    OModule();
-
-    /// this c'tor is a combination of the default c'tor and load()
-    OModule(const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT);
-    virtual ~OModule();
-
-    /// loads the specified module
-    sal_Bool SAL_CALL load(const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT);
-
-    /// unloads the currently loaded module
-    void SAL_CALL unload();
-
-    /// returns sal_True, if a module is loaded, sal_False otherwise
-    sal_Bool SAL_CALL isLoaded();
-
-#if 0
-    // not implemented yet
-    // returns the name of the currently loaded module or an empty string if none.
-    ::rtl::OUString SAL_CALL getModuleName();
-#endif
-
-    /// returns a pointer to the specified Symbol if found, NULL otherwise
-    void* SAL_CALL getSymbol(const ::rtl::OUString& strSymbolName);
-
-protected:
-
-    oslModule m_Module;
-};
-
-}
-
-#endif
-
-
diff --git a/vos/source/makefile.mk b/vos/source/makefile.mk
index 1b010f5..61584e7 100644
--- vos/source/makefile.mk
+++ vos/source/makefile.mk
@@ -51,7 +51,6 @@ SLOFILES= \
 				$(SLO)$/socket.obj      \
 				$(SLO)$/thread.obj      \
 				$(SLO)$/stream.obj      \
-				$(SLO)$/module.obj      \
 				$(SLO)$/timer.obj       \
 				$(SLO)$/process.obj     \
 				$(SLO)$/security.obj    \
@@ -65,7 +64,6 @@ OBJFILES= \
 				$(OBJ)$/socket.obj      \
 				$(OBJ)$/thread.obj      \
 				$(OBJ)$/stream.obj      \
-				$(OBJ)$/module.obj      \
 				$(OBJ)$/timer.obj       \
 				$(OBJ)$/process.obj     \
 				$(OBJ)$/security.obj    \
diff --git a/vos/source/module.cxx b/vos/source/module.cxx
deleted file mode 100644
index 2da53f8..0000000
--- vos/source/module.cxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: module.cxx,v $
- *
- *  $Revision: 1.3 $
- *
- *  last change: $Author: vg $ $Date: 2006/06/02 12:42:06 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
- *
- *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
- *
- ************************************************************************/
-
-
-#include <vos/module.hxx>
-#include <osl/diagnose.h>
-
-using namespace vos;
-
-VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OModule, vos),
-                        VOS_NAMESPACE(OModule, vos),
-                        VOS_NAMESPACE(OObject, vos), 0);
-
-
-OModule::OModule()
-	:m_Module(0)
-{
-}
-						
-OModule::OModule(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode) : m_Module(0)
-{
-    if (ustrModuleName)
-        load(ustrModuleName, nRtldMode);
-}
-
-OModule::~OModule()
-{
-    if (m_Module)
-        osl_unloadModule(m_Module);
-}
-
-sal_Bool OModule::load(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode)
-{
-    OSL_ASSERT(ustrModuleName);
-    
-    unload();
-    
-    m_Module = osl_loadModule( ustrModuleName.pData, nRtldMode );
-    
-    return (m_Module != 0);
-}
-
-void OModule::unload()
-{
-    if (m_Module)
-    {
-        osl_unloadModule(m_Module);
-        m_Module = 0;
-    }
-}
-
-sal_Bool OModule::isLoaded()
-{ 
-	return m_Module != NULL; 
-}
-
-void *OModule::getSymbol(const rtl::OUString& strSymbolName)
-{
-    OSL_ASSERT(strSymbolName);
-    OSL_ASSERT(m_Module);
-	return ( osl_getSymbol( m_Module, strSymbolName.pData ) );
-}
-
