diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-28 14:42:08 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-28 14:42:08 +0200 |
| commit | c54867053215d714733f2cf15413def40a0113e0 (patch) | |
| tree | 48dd884d199fda3ef2204928f46ca4e61b7355c5 | |
| parent | 67f68e85fc928507f490e8c4061073a606c59f6a (diff) | |
we are searching for prefix in activate
also fix small typo
| -rw-r--r-- | cppuhelper/source/factory.cxx | 21 | ||||
| -rw-r--r-- | stoc/source/loader/dllcomponentloader.cxx | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index f86fd3263..74eb3e8a0 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 9c27a1f1b..34c79b10c 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 ) { |