From 81a244a56a1d943b01d3b0b71fc657d22fd1eb35 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Fri, 21 Sep 2012 17:37:14 +0200 Subject: stoc: add more component prefixes Except bootstrap, javaloader and javavm. They are special. Change-Id: I28e28d07b4b1daf45f7416151a94ac376fc01db7 --- stoc/source/invocation/invocation.component | 2 +- stoc/source/invocation/invocation.cxx | 2 +- stoc/source/invocation_adapterfactory/iafactory.cxx | 2 +- stoc/source/invocation_adapterfactory/invocadapt.component | 2 +- stoc/source/namingservice/namingservice.component | 2 +- stoc/source/namingservice/namingservice.cxx | 2 +- stoc/source/proxy_factory/proxyfac.component | 2 +- stoc/source/proxy_factory/proxyfac.cxx | 2 +- stoc/source/stocservices/stocservices.cxx | 6 +----- stoc/util/stocservices.component | 2 +- 10 files changed, 10 insertions(+), 14 deletions(-) (limited to 'stoc') diff --git a/stoc/source/invocation/invocation.component b/stoc/source/invocation/invocation.component index 9a8864784309..d2ca9c492d3d 100644 --- a/stoc/source/invocation/invocation.component +++ b/stoc/source/invocation/invocation.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 59b5c293a272..8b7ea7029531 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -1211,7 +1211,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL invocation_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 396f0e1984fd..cd53f327054f 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -967,7 +967,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( } //============================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL invocadapt_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/stoc/source/invocation_adapterfactory/invocadapt.component b/stoc/source/invocation_adapterfactory/invocadapt.component index 09670aa6b7b9..551f4abaac76 100644 --- a/stoc/source/invocation_adapterfactory/invocadapt.component +++ b/stoc/source/invocation_adapterfactory/invocadapt.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/stoc/source/namingservice/namingservice.component b/stoc/source/namingservice/namingservice.component index 53d0a14803e8..0f6a41f4809c 100644 --- a/stoc/source/namingservice/namingservice.component +++ b/stoc/source/namingservice/namingservice.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index ee9fc1bdd157..4f08a9c128ef 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -203,7 +203,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL namingservice_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/source/proxy_factory/proxyfac.component b/stoc/source/proxy_factory/proxyfac.component index ed717a81c69d..912ed1529d5f 100644 --- a/stoc/source/proxy_factory/proxyfac.component +++ b/stoc/source/proxy_factory/proxyfac.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 54868e4766f0..cf211e017b85 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -510,7 +510,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) return g_moduleCount.canUnload( &g_moduleCount, pTime ); } -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL proxyfac_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx index f30bd35b216f..0ec496e9feb4 100644 --- a/stoc/source/stocservices/stocservices.cxx +++ b/stoc/source/stocservices/stocservices.cxx @@ -99,11 +99,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) #endif -#ifdef DISABLE_DYNLOADING -#define component_getFactory stocservices_component_getFactory -#endif - -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL stocservices_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/util/stocservices.component b/stoc/util/stocservices.component index f43185e1a793..5bd0dd207e64 100644 --- a/stoc/util/stocservices.component +++ b/stoc/util/stocservices.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - -- cgit