mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stoc: add more component prefixes

Browse Source 
Except bootstrap, javaloader and javavm. They are special.

Change-Id: I28e28d07b4b1daf45f7416151a94ac376fc01db7
This commit is contained in:
Matúš Kukan
2012-09-21 17:37:14 +02:00
parent 5c87937273
commit 81a244a56a
10 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stoc/source/invocation/invocation.component
View File

@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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="invocation"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.stoc.Invocation"> <implementation name="com.sun.star.comp.stoc.Invocation">
<service name="com.sun.star.script.Invocation"/> <service name="com.sun.star.script.Invocation"/>

2
stoc/source/invocation/invocation.cxx
View File

@@ -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 ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );

2
stoc/source/invocation_adapterfactory/iafactory.cxx
View File

@@ -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 ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return ::cppu::component_getFactoryHelper( return ::cppu::component_getFactoryHelper(

2
stoc/source/invocation_adapterfactory/invocadapt.component
View File

@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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="invocadapt"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.stoc.InvocationAdapterFactory"> <implementation name="com.sun.star.comp.stoc.InvocationAdapterFactory">
<service name="com.sun.star.script.InvocationAdapterFactory"/> <service name="com.sun.star.script.InvocationAdapterFactory"/>

2
stoc/source/namingservice/namingservice.component
View File

@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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="namingservice"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.stoc.NamingService"> <implementation name="com.sun.star.comp.stoc.NamingService">
<service name="com.sun.star.uno.NamingService"/> <service name="com.sun.star.uno.NamingService"/>

2
stoc/source/namingservice/namingservice.cxx
View File

@@ -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 ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );

2
stoc/source/proxy_factory/proxyfac.component
View File

@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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="proxyfac"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.reflection.ProxyFactory"> <implementation name="com.sun.star.comp.reflection.ProxyFactory">
<service name="com.sun.star.reflection.ProxyFactory"/> <service name="com.sun.star.reflection.ProxyFactory"/>

2
stoc/source/proxy_factory/proxyfac.cxx
View File

@@ -510,7 +510,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
return g_moduleCount.canUnload( &g_moduleCount, 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 ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return ::cppu::component_getFactoryHelper( return ::cppu::component_getFactoryHelper(

6
stoc/source/stocservices/stocservices.cxx
View File

@@ -99,11 +99,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
#endif #endif
#ifdef DISABLE_DYNLOADING SAL_DLLPUBLIC_EXPORT void * SAL_CALL stocservices_component_getFactory(
#define component_getFactory stocservices_component_getFactory
#endif
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );

2
stoc/util/stocservices.component
View File

@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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="stocservices"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.stoc.TypeConverter"> <implementation name="com.sun.star.comp.stoc.TypeConverter">
<service name="com.sun.star.script.Converter"/> <service name="com.sun.star.script.Converter"/>