diff options
| author | Matus Kukan <matus.kukan@gmail.com> | 2011-06-24 14:53:52 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-06-24 14:58:26 +0100 |
| commit | 25aeecfdc86de22e2ec29a9ed9a043b4af8542ab (patch) | |
| tree | 88f7abffde1f4dec84d9640ebe16a38cbf497a55 /framework | |
| parent | 44f80498068bfdbbea42331374ba0923b1d8a49c (diff) | |
update component factory methods to use new prefixes, to add lib merging
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/lomenubar/exports.cxx | 4 | ||||
| -rwxr-xr-x | framework/util/lomenubar.component | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx index bb4804e68fe5..a6b789b7ac16 100644 --- a/framework/source/lomenubar/exports.cxx +++ b/framework/source/lomenubar/exports.cxx @@ -54,13 +54,13 @@ static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >& extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvTypeName, +SAL_DLLPUBLIC_EXPORT void SAL_CALL lomenubar_component_getImplementationEnvironment(const sal_Char** ppEnvTypeName, uno_Environment** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName , +SAL_DLLPUBLIC_EXPORT void* SAL_CALL lomenubar_component_getFactory(const sal_Char* pImplName , void* pServiceManager, void* /*pRegistryKey*/ ) { diff --git a/framework/util/lomenubar.component b/framework/util/lomenubar.component index 628bcb7cc7a2..279ab3a7b5eb 100755 --- a/framework/util/lomenubar.component +++ b/framework/util/lomenubar.component @@ -27,7 +27,7 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. *--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="lomenubar" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="org.libreoffice.comp.framework.lomenubar.FrameJob"> <service name="com.sun.star.task.Job"/> |