Kaydet (Commit) 81a244a5 authored tarafından Matúš Kukan's avatar Matúš Kukan

stoc: add more component prefixes

Except bootstrap, javaloader and javavm. They are special.

Change-Id: I28e28d07b4b1daf45f7416151a94ac376fc01db7
üst 5c879372
......@@ -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="invocation"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.stoc.Invocation">
<service name="com.sun.star.script.Invocation"/>
......
......@@ -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 );
......
......@@ -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(
......
......@@ -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="invocadapt"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.stoc.InvocationAdapterFactory">
<service name="com.sun.star.script.InvocationAdapterFactory"/>
......
......@@ -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="namingservice"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.stoc.NamingService">
<service name="com.sun.star.uno.NamingService"/>
......
......@@ -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 );
......
......@@ -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="proxyfac"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.reflection.ProxyFactory">
<service name="com.sun.star.reflection.ProxyFactory"/>
......
......@@ -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(
......
......@@ -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 );
......
......@@ -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="stocservices"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.stoc.TypeConverter">
<service name="com.sun.star.script.Converter"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment