diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-06-24 12:24:49 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-06-24 14:23:25 +0100 |
| commit | babdd43fcee0963f80df3ed6574e8f70543827e2 (patch) | |
| tree | 58945e7d44d10c6d6474885a79cd39b215c6127a /cppuhelper/source | |
| parent | f1be5778f8c25df71cdfdda9884515c35834ab1c (diff) | |
re-work prefix handling and undo cppuhelper ABI change, add unit test
use a separate prefix enabled method instead of changing the ABI of cppuhelper
also - lookup the prefix in the dllcomponentloader in case we are called this way
also - add a unit test for the prefix change
Diffstat (limited to 'cppuhelper/source')
| -rw-r--r-- | cppuhelper/source/factory.cxx | 2 | ||||
| -rw-r--r-- | cppuhelper/source/shlib.cxx | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index a87d39ad91f5..bccc91db36eb 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -856,7 +856,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII ) { aPrefix = xPrefixKey->getAsciiValue(); - if (aPrefix.getLength() != 0) + if( aPrefix.getLength() != 0 ) aPrefix = aPrefix + OUSTR("_"); } } diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 1127cc3f0a4a..62d772637dfd 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -345,6 +345,17 @@ extern "C" {static void s_getFactory(va_list * pParam) *ppSSF = pSym(pImplName->getStr(), pSMgr, pKey); }} +/* For backwards compatibility */ +Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( + OUString const & rLibName, OUString const & rPath, + OUString const & rImplName, + Reference< lang::XMultiServiceFactory > const & xMgr, + Reference< registry::XRegistryKey > const & xKey ) + SAL_THROW( (loader::CannotActivateFactoryException) ) +{ + return loadSharedLibComponentFactory( rLibName, rPath, rImplName, xMgr, xKey, rtl::OUString() ); +} + Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( OUString const & rLibName, OUString const & rPath, OUString const & rImplName, |