diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-16 15:11:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-16 21:43:12 +0100 |
| commit | 698158655a9e2e74acc065899e668d365c2b4195 (patch) | |
| tree | 5cf6a176e309d8595ee504368f65d892426d93ef | |
| parent | 924f9d7ea89899848dba512a428e5f64e44ee534 (diff) | |
Clean-up: The "_" delimiter is logically not part of the prefix
Change-Id: I60329aabe465da48aac11ad76dd72e9a0ae4d078
| -rw-r--r-- | cppuhelper/source/servicemanager.cxx | 6 | ||||
| -rw-r--r-- | cppuhelper/source/shlib.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index ae2060d06058..f05ebaf76a18 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -650,12 +650,8 @@ void cppuhelper::ServiceManager::loadImplementation( if (!info->alienContext.is() && info->loader == "com.sun.star.loader.SharedLibrary") { - rtl::OUString prefix(info->prefix); - if (!prefix.isEmpty()) { - prefix += "_"; - } f0 = cppuhelper::detail::loadSharedLibComponentFactory( - uri, prefix, info->name, this); + uri, info->prefix, info->name, this); } else { SAL_WARN_IF( !info->prefix.isEmpty(), "cppuhelper", diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index ecb3f1fb4bff..4af19ec40afa 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -316,7 +316,11 @@ css::uno::Reference<css::uno::XInterface> loadSharedLibComponentFactory( OUString aExcMsg; - OUString aGetFactoryName = rPrefix + COMPONENT_GETFACTORY; + OUString aFullPrefix(rPrefix); + if (!aFullPrefix.isEmpty()) { + aFullPrefix += "_"; + } + OUString aGetFactoryName = aFullPrefix + COMPONENT_GETFACTORY; oslGenericFunction pSym = NULL; @@ -383,7 +387,7 @@ css::uno::Reference<css::uno::XInterface> loadSharedLibComponentFactory( if (pSym != 0) { - xRet = invokeComponentFactory( pSym, lib, moduleUri, rImplName, xMgr, rPrefix, aExcMsg ); + xRet = invokeComponentFactory( pSym, lib, moduleUri, rImplName, xMgr, aFullPrefix, aExcMsg ); } else { |