From 25aeecfdc86de22e2ec29a9ed9a043b4af8542ab Mon Sep 17 00:00:00 2001 From: Matus Kukan Date: Fri, 24 Jun 2011 14:53:52 +0100 Subject: update component factory methods to use new prefixes, to add lib merging --- fileaccess/source/FileAccess.cxx | 4 ++-- fileaccess/source/fileacc.component | 2 +- framework/source/lomenubar/exports.cxx | 4 ++-- framework/util/lomenubar.component | 2 +- sfx2/inc/sfx2/sfxuno.hxx | 4 ++-- sfx2/source/appl/appuno.cxx | 4 ++-- sfx2/util/sfx.component | 2 +- svx/source/core/coreservices.cxx | 4 ++-- svx/source/unodialogs/textconversiondlgs/services.cxx | 4 ++-- svx/source/unodraw/unoctabl.cxx | 4 ++-- svx/util/svx.component | 2 +- svx/util/svxcore.component | 3 ++- svx/util/textconversiondlgs.component | 2 +- xmloff/source/core/facreg.cxx | 4 ++-- xmloff/source/transform/XMLFilterRegistration.cxx | 6 +++--- xmloff/source/transform/xof.component | 2 +- xmloff/util/xo.component | 2 +- 17 files changed, 28 insertions(+), 27 deletions(-) diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index 1644c2724bbe..aa00c7447957 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -866,13 +866,13 @@ Sequence< rtl::OUString > FileAccess_getSupportedServiceNames() extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL fileacc_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL fileacc_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/fileaccess/source/fileacc.component b/fileaccess/source/fileacc.component index 3f14d4053216..f580c4b2eee1 100755 --- a/fileaccess/source/fileacc.component +++ b/fileaccess/source/fileacc.component @@ -26,7 +26,7 @@ * **********************************************************************--> - 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. *--> - diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx index d0fc3601b593..754b31bd1cb1 100644 --- a/sfx2/inc/sfx2/sfxuno.hxx +++ b/sfx2/inc/sfx2/sfxuno.hxx @@ -590,7 +590,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ } //************************************************************************************************************************ -// definition for "extern c component_getFactory()" +// definition for "extern c sfx_component_getFactory()" //************************************************************************************************************************ #define CREATEFACTORY(CLASS) \ \ @@ -598,7 +598,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ xFactory = CLASS::impl_createFactory( xServiceManager ); //************************************************************************************************************************ -// definition for "extern c component_getFactory()" +// definition for "extern c sfx_component_getFactory()" //************************************************************************************************************************ #define IF_NAME_CREATECOMPONENTFACTORY(CLASS) \ \ diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 193834d44ed5..5d5dfa99631c 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -2143,14 +2143,14 @@ SFX_IMPL_SINGLEFACTORY( TestMouseClickHandler ); extern "C" { -SFX2_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( +SFX2_DLLPUBLIC void SAL_CALL sfx_component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName , uno_Environment** ) { *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -SFX2_DLLPUBLIC void* SAL_CALL component_getFactory( +SFX2_DLLPUBLIC void* SAL_CALL sfx_component_getFactory( const sal_Char* pImplementationName , void* pServiceManager , void* ) diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component index dfa3d208a169..22ed1e4a9c12 100755 --- a/sfx2/util/sfx.component +++ b/sfx2/util/sfx.component @@ -26,7 +26,7 @@ * **********************************************************************--> - 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 @@ * **********************************************************************--> - 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. * **********************************************************************--> - + 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 @@ * **********************************************************************--> - diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index e50ecad6710d..b54ea767a1ab 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -164,7 +164,7 @@ extern "C" { #endif -XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) +XMLOFF_DLLPUBLIC void SAL_CALL xo_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -178,7 +178,7 @@ XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal classname##_getSupportedServiceNames() );\ } -XMLOFF_DLLPUBLIC void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; if( pServiceManager ) diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index 4db6da9a91b5..8cb4cf53ea27 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -142,12 +142,12 @@ extern "C" { #endif -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL xof_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = NULL; if( pServiceManager ) @@ -183,7 +183,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImpl } catch( uno::Exception& ) { - OSL_FAIL( "xof::component_getFactory: Exception!" ); + OSL_FAIL( "xof::xof_component_getFactory: Exception!" ); } } diff --git a/xmloff/source/transform/xof.component b/xmloff/source/transform/xof.component index 8f9c88f7fa0d..b5254b1c2b97 100755 --- a/xmloff/source/transform/xof.component +++ b/xmloff/source/transform/xof.component @@ -26,7 +26,7 @@ * **********************************************************************--> - diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index 7fe2119636d1..1bbba25d3e1d 100755 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -26,7 +26,7 @@ * **********************************************************************--> - -- cgit