Clean-up: The "_" delimiter is logically not part of the prefix

Change-Id: I60329aabe465da48aac11ad76dd72e9a0ae4d078

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",

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
     {