summaryrefslogtreecommitdiff
path: root/ure/source/uretest/cppmain.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ure/source/uretest/cppmain.cc')
-rw-r--r--ure/source/uretest/cppmain.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index 816c58ef92ae..b8ad02a7a5d7 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -111,11 +111,8 @@ private:
}
static char const * const services[] = {
"com.sun.star.beans.Introspection",
- "com.sun.star.bridge.Bridge",
"com.sun.star.bridge.BridgeFactory",
- "com.sun.star.bridge.IiopBridge",
"com.sun.star.bridge.UnoUrlResolver",
- "com.sun.star.bridge.UrpBridge",
"com.sun.star.connection.Acceptor",
"com.sun.star.connection.Connector",
"com.sun.star.io.DataInputStream",
@@ -161,10 +158,10 @@ private:
static_cast< ::cppu::OWeakObject * >(this));
}
for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) {
+ ::rtl::OUString name(::rtl::OUString::createFromAscii(services[i]));
::css::uno::Reference< ::css::uno::XInterface > instance;
try {
- instance = manager->createInstanceWithContext(
- ::rtl::OUString::createFromAscii(services[i]), context_);
+ instance = manager->createInstanceWithContext(name, context_);
} catch (::css::uno::RuntimeException &) {
throw;
} catch (::css::uno::Exception &) {
@@ -175,7 +172,7 @@ private:
}
if (!instance.is()) {
throw ::css::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no instance")),
+ "no instance: " + name,
static_cast< ::cppu::OWeakObject * >(this));
}
}
@@ -252,7 +249,7 @@ namespace CppMain {
}
-extern "C" ::sal_Bool SAL_CALL component_writeInfo(
+extern "C" SAL_DLLPUBLIC_EXPORT ::sal_Bool SAL_CALL component_writeInfo(
void * serviceManager, void * registryKey)
{
return ::cppu::component_writeInfoHelper(