diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-01 14:46:53 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-01 21:06:11 +0200 |
| commit | d93fdcf391bdbab03933ceefa9a4457f4b635f44 (patch) | |
| tree | a712ba053d253e87bd967f0c1d94bda06f00556a /stoc | |
| parent | 009be0a85096ae3594c061922950fc045848f8c8 (diff) | |
add more component prefixes
Change-Id: I3afe59a6326b9e5cb26c39a82d7aabdb05cc2b7e
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/corereflection/crefl.cxx | 6 | ||||
| -rw-r--r-- | stoc/source/corereflection/reflection.component | 2 | ||||
| -rw-r--r-- | stoc/source/inspect/introspection.component | 2 | ||||
| -rw-r--r-- | stoc/source/inspect/introspection.cxx | 6 |
4 files changed, 4 insertions, 12 deletions
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index ffae95788345..1af1b3a629de 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -469,12 +469,8 @@ 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( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL reflection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); diff --git a/stoc/source/corereflection/reflection.component b/stoc/source/corereflection/reflection.component index 13d9cadc44f4..4835f31ea6a6 100644 --- a/stoc/source/corereflection/reflection.component +++ b/stoc/source/corereflection/reflection.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="reflection" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.CoreReflection"> <service name="com.sun.star.reflection.CoreReflection"/> diff --git a/stoc/source/inspect/introspection.component b/stoc/source/inspect/introspection.component index 717349628d95..79f16686ea64 100644 --- a/stoc/source/inspect/introspection.component +++ b/stoc/source/inspect/introspection.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="introspection" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.stoc.Introspection"> <service name="com.sun.star.beans.Introspection"/> diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 049d61cffb58..cdb285d6c9bb 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2874,13 +2874,9 @@ 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( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL introspection_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * ) { |