summaryrefslogtreecommitdiff
path: root/stoc/test/testintrosp.cxx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2003-04-23 15:14:39 +0000
committerRüdiger Timm <rt@openoffice.org>2003-04-23 15:14:39 +0000
commit1bd272a638bb36a12dff1c1490af68447d2df8d3 (patch)
tree10bb777c376bcfaa330bc379ba2304ebebf901b0 /stoc/test/testintrosp.cxx
parentb5ac79d7aaae7734b0871b5824824b584bc683a7 (diff)
INTEGRATION: CWS uno2 (1.8.10.1.16); FILE MERGED
2003/04/08 13:56:29 dbo 1.8.10.1.16.1: #107991# UNO shared library component renaming
Diffstat (limited to 'stoc/test/testintrosp.cxx')
-rw-r--r--stoc/test/testintrosp.cxx29
1 files changed, 6 insertions, 23 deletions
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 30803f754266..5886aeb3aa0b 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testintrosp.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: vg $ $Date: 2003-04-15 17:14:24 $
+ * last change: $Author: rt $ $Date: 2003-04-23 16:14:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1595,18 +1595,8 @@ int __cdecl main( int argc, char * argv[] )
OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
// Register services
- OUString libName;
-
- // CoreReflection
-#ifdef SAL_W32
- libName = OUString::createFromAscii("corefl.dll");
-#else
-#ifdef MACOSX
- libName = OUString::createFromAscii("libcorefl.dylib");
-#else
- libName = OUString::createFromAscii("libcorefl.so");
-#endif
-#endif
+ OUString libName( RTL_CONSTASCII_USTRINGPARAM(
+ "corereflection.uno" SAL_DLLEXTENSION) );
// ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("corefl"), libName);
fprintf(stderr, "1\n" );
xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
@@ -1616,15 +1606,8 @@ int __cdecl main( int argc, char * argv[] )
OSL_ENSURE( xRefl.is(), "### no corereflection!" );
// Introspection
-#ifdef SAL_W32
- libName = OUString::createFromAscii("insp.dll");
-#else
-#ifdef MACOSX
- libName = OUString::createFromAscii("libinsp.dylib");
-#else
- libName = OUString::createFromAscii("libinsp.so");
-#endif
-#endif
+ libName = OUString::createFromAscii(
+ "introspection.uno" SAL_DLLEXTENSION);
// ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("insp"), libName);
fprintf(stderr, "3\n" );
xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),