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 /svx | |
| parent | 44f80498068bfdbbea42331374ba0923b1d8a49c (diff) | |
update component factory methods to use new prefixes, to add lib merging
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/core/coreservices.cxx | 4 | ||||
| -rw-r--r-- | svx/source/unodialogs/textconversiondlgs/services.cxx | 4 | ||||
| -rw-r--r-- | svx/source/unodraw/unoctabl.cxx | 4 | ||||
| -rwxr-xr-x | svx/util/svx.component | 2 | ||||
| -rwxr-xr-x | svx/util/svxcore.component | 3 | ||||
| -rwxr-xr-x | svx/util/textconversiondlgs.component | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index 63fc7614ec99..cd15ad70f207 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -72,13 +72,13 @@ extern Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupporte extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( +SAL_DLLPUBLIC_EXPORT void SAL_CALL svxcore_component_getImplementationEnvironment ( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL svxcore_component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index 330a069140c2..ed4295b5ec39 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -48,13 +48,13 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL textconversiondlgs_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL textconversiondlgs_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 5f66007443a2..68a4c5d750cc 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -256,13 +256,13 @@ extern uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedS extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( +SAL_DLLPUBLIC_EXPORT void SAL_CALL svx_component_getImplementationEnvironment ( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL svx_component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/svx/util/svx.component b/svx/util/svx.component index 5907d69fef50..3e31d96db28a 100755 --- a/svx/util/svx.component +++ b/svx/util/svx.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="svx" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.Draw.GraphicExporter"> <service name="com.sun.star.drawing.GraphicExportFilter"/> diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component index d266e06188c1..3f6aeeb29d9f 100755 --- a/svx/util/svxcore.component +++ b/svx/util/svxcore.component @@ -25,7 +25,8 @@ * for a copy of the LGPLv3 License. * **********************************************************************--> -<component xmlns="http://openoffice.org/2010/uno-components" loader="com.sun.star.loader.SharedLibrary"> +<component loader="com.sun.star.loader.SharedLibrary" prefix="svxcore" + xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.svx.ExtrusionDepthController"> <service name="com.sun.star.frame.PopupMenuController"/> </implementation> diff --git a/svx/util/textconversiondlgs.component b/svx/util/textconversiondlgs.component index 184743583645..ebac1d6b68e2 100755 --- a/svx/util/textconversiondlgs.component +++ b/svx/util/textconversiondlgs.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="textconversiondlgs" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.linguistic2.ChineseTranslationDialog"> <service name="com.sun.star.linguistic2.ChineseTranslationDialog"/> |