diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-10-04 07:08:02 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-10-04 07:23:25 +0300 |
| commit | 0c1553a86e837b7538dc0f80316ed0798747756b (patch) | |
| tree | 9d9faba507bf5ad2cbdcd44caeadf54175f6a089 /cppuhelper | |
| parent | 4fdc50d8662be6d830101d5d2045de8ead780b7b (diff) | |
Disable-dynloading updates to component list
Change-Id: Idf092958e46a2ad9d56541c90c5a2beb44baff48
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/shlib.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index f783f870c62d..b89fc5b1ead7 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -462,11 +462,13 @@ extern "C" extern void * reflection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sfx_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * svl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * tk_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * stocservices_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * i18npool_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 * ucpfile_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * utl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * vcl_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * xstor_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); } #endif @@ -525,24 +527,27 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( oslGenericFunction pSym = NULL; #ifdef DISABLE_DYNLOADING + // First test library names that aren't app-specific. static lib_to_component_mapping non_app_specific_map[] = { { "bootstrap.uno" SAL_DLLEXTENSION, bootstrap_component_getFactory }, { "bootstrap.uno.a", bootstrap_component_getFactory }, { "configmgr.uno.a", configmgr_component_getFactory }, - { "expwrap.uno.a", expwrap_component_getFactory }, - { "fastsax.uno.a", fastsax_component_getFactory }, - { "introspection.uno.a", introspection_component_getFactory }, { "i18npool.uno.a", i18npool_component_getFactory }, + { "introspection.uno.a", introspection_component_getFactory }, { "libcomphelp" CPPU_STRINGIFY(CPPU_ENV) ".a", comphelp_component_getFactory }, + { "libexpwrap.uno.a", expwrap_component_getFactory }, + { "libfastsax.uno.a", fastsax_component_getFactory }, { "libfilterconfiglo.a", filterconfig1_component_getFactory }, { "libfwklo.a", fwk_component_getFactory }, { "libpackage2.a", package2_component_getFactory }, { "libsfxlo.a", sfx_component_getFactory }, { "libsvllo.a", svl_component_getFactory }, + { "libtklo.a", tk_component_getFactory }, { "libucb1.a", ucb_component_getFactory }, { "libucpfile1.a", ucpfile_component_getFactory }, { "libutllo.a", utl_component_getFactory }, + { "libvcllo.a", vcl_component_getFactory }, { "libxstor.a", xstor_component_getFactory }, { "reflection.uno.a", reflection_component_getFactory }, { "stocservices.uno.a", stocservices_component_getFactory }, |