1 files changed, 18 insertions, 53 deletions
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 2c71a2843c37..fdff8c2849be 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -25,71 +25,36 @@
  *
  ************************************************************************/
 
-#ifndef _DLLMGR_HXX
-#define _DLLMGR_HXX
+#ifndef INCLUDED_BASIC_SOURCE_RUNTIME_DLLMGR_HXX
+#define INCLUDED_BASIC_SOURCE_RUNTIME_DLLMGR_HXX
 
-#define _SVSTDARR_BYTESTRINGSSORT
-#include <svl/svarray.hxx>
-#ifndef _SVSTDARR_HXX //autogen
-#include <svl/svstdarr.hxx>
-#endif
+#include "sal/config.h"
 
-// !!! nur zum debuggen fuer infoboxes !!!
-//#ifndef _SV_HXX
-//#include <sv.hxx>
-//#endif
+#include <memory>
 
-//#ifndef _TOOLS_HXX
-//#include <tools.hxx>
-//#endif
-#define _SVSTDARR_STRINGS
-//#ifndef _SVSTDARR_HXX
-//#include <svstdarr.hxx>
-//#endif
-#ifndef _SBERRORS_HXX
-#include <basic/sberrors.hxx>
-#endif
+#include "basic/sberrors.hxx"
+#include "boost/noncopyable.hpp"
 
+namespace rtl { class OUString; }
 class SbxArray;
 class SbxVariable;
 
-class ImplSbiDll;
-class ImplSbiProc;
-
-SV_DECL_PTRARR_SORT(ImplDllArr,ByteStringPtr,5,5)
-
-class SbiDllMgr
-{
-    ImplDllArr  aDllArr;
-
-    SbiDllMgr( const SbiDllMgr& );
+class SbiDllMgr: private boost::noncopyable {
+public:
+    SbiDllMgr();
 
-#ifdef _DLLMGR_CXX
-    ImplSbiDll*     GetDll( const ByteString& rDllName );
-    SbiDllProc      GetProc( ImplSbiDll*, const ByteString& rProcName );
+    ~SbiDllMgr();
 
-    SbiDllHandle    CreateDllHandle( const ByteString& rDllName );
-    void            FreeDllHandle( SbiDllHandle );
-    SbiDllProc      GetProcAddr( SbiDllHandle, const ByteString& pProcName );
-    SbError         CallProc( SbiDllProc pProc, SbxArray* pArgs,
-                              SbxVariable& rResult );
-    SbError         CallProcC( SbiDllProc pProc, SbxArray* pArgs,
-                              SbxVariable& rResult );
-    void*           CreateStack( SbxArray* pArgs, USHORT& rSize );
-    void            CheckDllName( ByteString& rName );
-#endif
+    SbError Call(
+        rtl::OUString const & function, rtl::OUString const &  library,
+        SbxArray * arguments, SbxVariable & result, bool cdeclConvention);
 
-public:
-                    SbiDllMgr();
-                    ~SbiDllMgr();
+    void FreeDll(rtl::OUString const & library);
 
-    SbError         Call( const char* pFunc, const char* pDll,
-                          SbxArray* pArgs, SbxVariable& rResult,
-                          BOOL bCDecl );
+private:
+    struct Impl;
 
-    void            FreeDll( const ByteString& rDllName );
+    std::auto_ptr< Impl > impl_;
 };
 
-
-
 #endif