Skip to content

C
core
Kaydet (Commit) 1a4cbf9f authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

More static lib name mappings. Yeah, need to do a gperf thing some night

üst e362ccba
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 16 deletions
cppuhelper/source/shlib.cxx
Dosyayı görüntüle @ 1a4cbf9f
...@@ -459,22 +459,13 @@ Reference< XInterface > invokeComponentFactory( ...@@ -459,22 +459,13 @@ Reference< XInterface > invokeComponentFactory(
#ifdef DISABLE_DYNLOADING #ifdef DISABLE_DYNLOADING
extern "C" extern "C"
{ {
// In stoc/source/bootstrap/services.cxx. extern void * bootstrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * configmgr_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
// Sure, some public header would be a better place for this. But extern void * fwk_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
// it can't be in some stoc header as that hasn't been built and extern void * i18npool_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
// delivered yet when cppuhelper is built. extern void * sc_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * ucb_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * bootstrap_component_getFactory( extern void * ucpfile_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
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 #endif
...@@ -540,6 +531,12 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( ...@@ -540,6 +531,12 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
pSym = (oslGenericFunction) configmgr_component_getFactory; pSym = (oslGenericFunction) configmgr_component_getFactory;
else if ( rLibName.equals( OUSTR("libucpfile1.a")) ) else if ( rLibName.equals( OUSTR("libucpfile1.a")) )
pSym = (oslGenericFunction) ucpfile_component_getFactory; pSym = (oslGenericFunction) ucpfile_component_getFactory;
else if ( rLibName.equals( OUSTR("libsclo.a")) )
pSym = (oslGenericFunction) sc_component_getFactory;
else if ( rLibName.equals( OUSTR("libfwklo.a")) )
pSym = (oslGenericFunction) fwk_component_getFactory;
else if ( rLibName.equals( OUSTR("i18npool.uno.a")) )
pSym = (oslGenericFunction) i18npool_component_getFactory;
else else
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment