ORealDynamicLoader scratched out

3 files changed, 28 insertions, 12 deletions

diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 2e917fcbc008..703837792cc9 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testintrosp.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:35 $
+ *  last change: $Author: dbo $ $Date: 2000-11-08 09:36:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1595,14 +1595,24 @@ int __cdecl main( int argc, char * argv[] )
         OUString libName;
 
         // CoreReflection
-        ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("corefl"), libName);
+#ifdef SAL_W32
+        libName = OUString::createFromAscii("corefl.dll");
+#else
+        libName = OUString::createFromAscii("libcorefl.so");
+#endif
+//          ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("corefl"), libName);
         xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
                                          libName, Reference< XSimpleRegistry >() );
         Reference< XIdlReflection > xRefl( xMgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection") ), UNO_QUERY );
         VOS_ENSHURE( xRefl.is(), "### no corereflection!" );
 
         // Introspection
-        ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("insp"), libName);
+#ifdef SAL_W32
+        libName = OUString::createFromAscii("insp.dll");
+#else
+        libName = OUString::createFromAscii("libinsp.so");
+#endif
+//          ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("insp"), libName);
         xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
                                          libName, Reference< XSimpleRegistry >() );
         Reference< XIntrospection > xIntrosp( xMgr->createInstance( OUString::createFromAscii("com.sun.star.beans.Introspection") ), UNO_QUERY );
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index c2a664f46eed..01491a7f8e83 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testloader.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:36 $
+ *  last change: $Author: dbo $ $Date: 2000-11-08 09:36:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,8 +108,11 @@ int _cdecl main( int argc, char * argv[] )
 
     OModule* pModule = new OModule(OUString());
 
-    OUString dllName;
-    NAMESPACE_VOS(ORealDynamicLoader)::computeLibraryName(OUString::createFromAscii("cpld"), dllName);
+#ifdef SAL_W32
+    OUString dllName( OUString::createFromAscii("cpld.dll") );
+#else
+    OUString dllName( OUString::createFromAscii("libcpld.so") );
+#endif
 
     if (pModule->load(dllName))
     {
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index 8ff0cf91bd36..13eb146ca5f4 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testregistry.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:36 $
+ *  last change: $Author: dbo $ $Date: 2000-11-08 09:36:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -195,8 +195,11 @@ void test_SimpleRegistry()
     Reference<XInterface> xIFace;
     OModule* pModule = new OModule(OUString());
 
-    OUString dllName;
-    NAMESPACE_VOS(ORealDynamicLoader)::computeLibraryName(OUString::createFromAscii("simreg"), dllName);
+#ifdef SAL_W32
+    OUString dllName( OUString::createFromAscii("simreg.dll") );
+#else
+    OUString dllName( OUString::createFromAscii("libsimreg.so") );
+#endif
 
     if (pModule->load(dllName))
     {