[Libreoffice-commits] core.git: stoc/source

[Stephan Bergmann]

 stoc/source/loader/dllcomponentloader.cxx |   22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 22edbdf53cc22c6cd5bb1cff99508fe4f588f462
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 11 15:46:14 2013 +0200

    No need to support "prefix" in DllComponentLoader
    
    ...which is only used for extension components, and only while they are live-
    deployed into an soffice process and thus offloaded to an additional uno
    process (which never happens for bundled extensions), cf.
    cppuhelper::ServiceManager::loadImplementation
    (cppuhelper/source/servicemanager.cxx), and (at least non-bundled) extensions
    should never use the "prefix" feature anyway, cf.
    3bafe5f5f529f6539363c5a291dd13ef1e2cbbde "Extension shared library components
    must not use the 'prefix' feature."
    
    Change-Id: I19c4b71029eccf0c4f3d4481ea5f3542205f685e

diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 854487d..9720ac0 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -161,31 +161,13 @@ void DllComponentLoader::initialize( const ::com::sun::star::uno::Sequence< ::co
 //*************************************************************************
 Reference<XInterface> SAL_CALL DllComponentLoader::activate(
     const OUString & rImplName, const OUString &, const OUString & rLibName,
-    const Reference< XRegistryKey > & xKey )
+    const Reference< XRegistryKey > & )
 
     throw(CannotActivateFactoryException, RuntimeException)
 {
-    OUString aPrefix;
-    if( xKey.is() )
-    {
-        Reference<XRegistryKey > xActivatorKey = xKey->openKey(
-                OUString("/UNO/ACTIVATOR") );
-        if (xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII )
-        {
-            Reference<XRegistryKey > xPrefixKey = xKey->openKey(
-                OUString("/UNO/PREFIX") );
-            if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII )
-            {
-                aPrefix = xPrefixKey->getAsciiValue();
-                if( !aPrefix.isEmpty() )
-                    aPrefix = aPrefix + "_";
-            }
-        }
-    }
-
     return loadSharedLibComponentFactory(
         cppu::bootstrap_expandUri(rLibName), OUString(), rImplName, m_xSMgr,
-        css::uno::Reference<css::registry::XRegistryKey>(), aPrefix );
+        css::uno::Reference<css::registry::XRegistryKey>(), OUString() );
 }