diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-12 18:06:31 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-25 12:45:35 +0200 |
| commit | 4d7b9557052a31319b0583b46340fbc64de056c5 (patch) | |
| tree | bffb951b73fba8b8b8e935222e5a26cc5a7e1ada /shell | |
| parent | f92fcff04a6a88fd004e721294a4817249cabf26 (diff) | |
libmerged: add more libraries
Change-Id: Ia35e93b9632cb2bbfce0d40f8491044d56f2bb05
Diffstat (limited to 'shell')
4 files changed, 5 insertions, 4 deletions
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index e84e09639edd..8f05182c1b7f 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -249,7 +249,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL desktopbe1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/desktopbe/desktopbe1.component b/shell/source/backends/desktopbe/desktopbe1.component index 9ef142107698..9b1df73141db 100644 --- a/shell/source/backends/desktopbe/desktopbe1.component +++ b/shell/source/backends/desktopbe/desktopbe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="desktopbe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.DesktopBackend"> <service name="com.sun.star.configuration.backend.DesktopBackend"/> diff --git a/shell/source/backends/localebe/localebe1.component b/shell/source/backends/localebe/localebe1.component index 7236a6198281..83913822a022 100644 --- a/shell/source/backends/localebe/localebe1.component +++ b/shell/source/backends/localebe/localebe1.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="localebe1" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.configuration.backend.LocaleBackend"> <service name="com.sun.star.configuration.backend.LocaleBackend"/> diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index ee7b1edd73af..b10d7919d811 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -59,7 +59,8 @@ static const cppu::ImplementationEntry kImplementations_entries[] = //------------------------------------------------------------------------------ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory( + const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { |