[Libreoffice-commits] .: cppuhelper/source stoc/source

[Matus Kukan]

 cppuhelper/source/factory.cxx             |   21 ---------------------
 stoc/source/loader/dllcomponentloader.cxx |    2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit c54867053215d714733f2cf15413def40a0113e0
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Jul 28 14:42:08 2011 +0200

    we are searching for prefix in activate
    
    also fix small typo

diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index f86fd32..74eb3e8 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -834,7 +834,6 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
     OUString aActivatorUrl;
     OUString aActivatorName;
     OUString aLocation;
-    OUString aPrefix;
 
     Reference<XRegistryKey > xActivatorKey = xImplementationKey->openKey(
         OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) );
@@ -850,15 +849,6 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
             OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/LOCATION") ) );
         if( xLocationKey.is() && xLocationKey->getValueType() == RegistryValueType_ASCII )
             aLocation = xLocationKey->getAsciiValue();
-
-        Reference<XRegistryKey > xPrefixKey = xImplementationKey->openKey(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/PREFIX") ) );
-        if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII )
-        {
-            aPrefix = xPrefixKey->getAsciiValue();
-            if( aPrefix.getLength() != 0 )
-                aPrefix = aPrefix + OUSTR("_");
-        }
     }
     else
     {
@@ -893,17 +883,6 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
         Reference<XInterface > x = xSMgr->createInstance( aActivatorName );
         Reference<XImplementationLoader > xLoader( x, UNO_QUERY );
         Reference<XInterface > xMF;
-        if( aActivatorName == OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary") ) )
-        {
-            try
-            {
-                return loadSharedLibComponentFactory( bootstrap_expandUri( aLocation ), OUString(),  aImplementationName, xSMgr, xImplementationKey, aPrefix );
-            }
-            catch ( IllegalArgumentException & e )
-            {
-                throw RuntimeException( e.Message, e.Context );
-            }
-        }
         if (xLoader.is())
         {
             xFactory = xLoader->activate( aImplementationName, aActivatorUrl, aLocation, xImplementationKey );
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 9c27a1f..34c79b1 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -209,7 +209,7 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate(
                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) );
         if (xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII )
         {
-            Reference<XRegistryKey > xPrefixKey = xActivatorKey->openKey(
+            Reference<XRegistryKey > xPrefixKey = xKey->openKey(
                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/PREFIX") ) );
             if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII )
             {