INTEGRATION: CWS uno2 (1.11.42); FILE MERGED

2003/04/08 13:56:30 dbo 1.11.42.1: #107991# UNO shared library component renaming
This commit is contained in:
Rüdiger Timm 2003-04-23 15:15:04 +00:00
parent 858db19dd1
commit 91e0fc8ca4

View file

@ -2,9 +2,9 @@
*
* $RCSfile: testregistry.cxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: vg $ $Date: 2003-04-15 17:14:45 $
* last change: $Author: rt $ $Date: 2003-04-23 16:15:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -228,15 +228,8 @@ void test_SimpleRegistry(
Reference<XInterface> xIFace;
Module module;
#ifdef SAL_W32
OUString dllName( OUString::createFromAscii("simreg.dll") );
#else
#ifdef MACOSX
OUString dllName( OUString::createFromAscii("libsimreg.dylib") );
#else
OUString dllName( OUString::createFromAscii("libsimreg.so") );
#endif
#endif
OUString dllName(
RTL_CONSTASCII_USTRINGPARAM("simplreg.uno" SAL_DLLEXTENSION) );
if (module.load(dllName))
{
@ -246,8 +239,9 @@ void test_SimpleRegistry(
if (pCompFactoryFunc)
{
XSingleServiceFactory * pRet = (XSingleServiceFactory *)(*pCompFactoryFunc)(
"com.sun.star.comp.stoc.SimpleRegistry", 0, 0 );
XSingleServiceFactory * pRet = (XSingleServiceFactory *)
(*pCompFactoryFunc)(
"com.sun.star.comp.stoc.SimpleRegistry", 0, 0 );
if (pRet)
{
xIFace = pRet;