diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-28 22:56:17 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-29 09:49:45 +0300 |
| commit | b5e4de326fb3422736c6ceb32e419ef95dbb57df (patch) | |
| tree | fa7ef939d7bcac0873315365ce3c97edcf23e426 /cppuhelper | |
| parent | ded39ff8f6b17b4493f3a612a0f6f39181766414 (diff) | |
Add some more temporary hardcoded library mappings for DISABLE_DYNLOADING
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/shlib.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 3c1445e02b10..df898a66f5f3 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -467,6 +467,14 @@ extern "C" extern void * bootstrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + + // More of them, in order of discovery. This is a temporary way to handle this.. + extern void * ucb_component_getFactory( + const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * configmgr_component_getFactory( + const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * ucpfile_component_getFactory( + const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); } #endif @@ -525,11 +533,17 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( #ifdef DISABLE_DYNLOADING if ( rLibName.equals( OUSTR("bootstrap.uno" SAL_DLLEXTENSION)) ) - pSym = (oslGenericFunction) bootstrap_component_getFactory; + pSym = (oslGenericFunction) bootstrap_component_getFactory; + else if ( rLibName.equals( OUSTR("libucb1.a")) ) + pSym = (oslGenericFunction) ucb_component_getFactory; + else if ( rLibName.equals( OUSTR("configmgr.uno.a")) ) + pSym = (oslGenericFunction) configmgr_component_getFactory; + else if ( rLibName.equals( OUSTR("libucpfile1.a")) ) + pSym = (oslGenericFunction) ucpfile_component_getFactory; else { #if OSL_DEBUG_LEVEL > 1 - OSL_TRACE( "%s: attempting to load unknown library %s", __PRETTY_FUNCTION__, OUStringToOString( rLibName, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OSL_TRACE( "attempting to load unknown library %s", OUStringToOString( rLibName, RTL_TEXTENCODING_ASCII_US ).getStr() ); #endif } #else |