diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-28 00:16:21 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-28 00:17:37 +0200 |
| commit | 5ef3e4ca5ba9725178481bdd066564340a51a3cc (patch) | |
| tree | 3bc29d52536de80c001d3cebe95464c7c383b2af /cppuhelper | |
| parent | aeb1c38c8c6dd2b092102c5f6ee5749f5b6c15cb (diff) | |
Do support the deployment component unconditionally, and add ucpexpand1
Change-Id: I8a3749be43efc77317f7f10c7fd6eadaf79f99c7
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/shlib.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 1ffa6153d8b1..9a741d53174a 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -445,9 +445,7 @@ extern "C" 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 ); extern void * comphelp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); -#if HAVE_FEATURE_EXTENSIONS extern void * deployment_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); -#endif extern void * expwrap_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * fastsax_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * filterconfig1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); @@ -462,6 +460,7 @@ extern "C" 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 * ucpexpand1_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 ); @@ -546,6 +545,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( { "liblocalebe1.uno.a", localebe1_component_getFactory }, { "libreflection.uno.a", reflection_component_getFactory }, { "libstocservices.uno.a", stocservices_component_getFactory }, + { "libucpexpand1.uno.a", ucpexpand1_component_getFactory }, #else { "configmgr.uno.a", configmgr_component_getFactory }, { "expwrap.uno.a", expwrap_component_getFactory }, @@ -555,11 +555,10 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( { "localebe1.uno.a", localebe1_component_getFactory }, { "reflection.uno.a", reflection_component_getFactory }, { "stocservices.uno.a", stocservices_component_getFactory }, + { "ucpexpand1.uno.a", ucpexpand1_component_getFactory }, #endif { "libcomphelp" CPPU_STRINGIFY(CPPU_ENV) ".a", comphelp_component_getFactory }, -#if HAVE_FEATURE_EXTENSIONS { "libdeployment.a", deployment_component_getFactory }, -#endif { "libfilterconfiglo.a", filterconfig1_component_getFactory }, { "libfwklo.a", fwk_component_getFactory }, { "libpackage2.a", package2_component_getFactory }, |