From cfdeb0895a0284c3d38eed4143809b9ad39d798c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 16 Apr 2012 23:30:22 +0300 Subject: [PATCH] prefix the component_getFactory name for DISABLE_DYNLOADING --- stoc/source/corereflection/crefl.cxx | 4 ++++ stoc/source/inspect/introspection.cxx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 1296ccd1ec70..5adcba762225 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -478,6 +478,10 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) return g_moduleCount.canUnload( &g_moduleCount , pTime ); } +#ifdef DISABLE_DYNLOADING +#define component_getFactory reflection_component_getFactory +#endif + //================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index fe987071202e..207088dd5a2b 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2906,6 +2906,10 @@ Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Referen } +#ifdef DISABLE_DYNLOADING +#define component_getFactory introspection_component_getFactory +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(