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

add more component prefixes

Change-Id: I3afe59a6326b9e5cb26c39a82d7aabdb05cc2b7e
üst 009be0a8
...@@ -98,7 +98,7 @@ CREATEINSTANCE ( StatusIndicator ) ...@@ -98,7 +98,7 @@ CREATEINSTANCE ( StatusIndicator )
// create right component factory // create right component factory
//______________________________________________________________________________________________________________ //______________________________________________________________________________________________________________
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName , extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL ctl_component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager , void* pServiceManager ,
void* /*pRegistryKey*/ ) void* /*pRegistryKey*/ )
{ {
......
...@@ -17,7 +17,7 @@ ...@@ -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="ctl"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="stardiv.UnoControls.FrameControl"> <implementation name="stardiv.UnoControls.FrameControl">
<service name="com.sun.star.frame.FrameControl"/> <service name="com.sun.star.frame.FrameControl"/>
......
...@@ -38,7 +38,7 @@ using namespace ::com::sun::star; ...@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
extern "C" { extern "C" {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
{ {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
**********************************************************************--> **********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary" <component loader="com.sun.star.loader.SharedLibrary" prefix="embobj"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.embed.EmbeddedObjectCreator"> <implementation name="com.sun.star.comp.embed.EmbeddedObjectCreator">
<service name="com.sun.star.comp.embed.EmbeddedObjectCreator"/> <service name="com.sun.star.comp.embed.EmbeddedObjectCreator"/>
......
...@@ -905,7 +905,7 @@ Sequence< Reference<XEventListener> > EventAttacherImpl::attachMultipleEventList ...@@ -905,7 +905,7 @@ Sequence< Reference<XEventListener> > EventAttacherImpl::attachMultipleEventList
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL evtatt_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * ) const sal_Char * pImplName, void * pServiceManager, void * )
{ {
void * pRet = 0; void * pRet = 0;
......
...@@ -17,7 +17,7 @@ ...@@ -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="evtatt"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.EventAttacher"> <implementation name="com.sun.star.comp.EventAttacher">
<service name="com.sun.star.script.EventAttacher"/> <service name="com.sun.star.script.EventAttacher"/>
......
...@@ -17,7 +17,7 @@ ...@@ -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="hwp"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.comp.hwpimport.HwpImportFilter"> <implementation name="com.sun.comp.hwpimport.HwpImportFilter">
<service name="com.sun.star.document.ImportFilter"/> <service name="com.sun.star.document.ImportFilter"/>
......
...@@ -331,7 +331,7 @@ Sequence< OUString> HwpImportFilter::getSupportedServiceNames() throw(::com::sun ...@@ -331,7 +331,7 @@ Sequence< OUString> HwpImportFilter::getSupportedServiceNames() throw(::com::sun
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) SAL_DLLPUBLIC_EXPORT void * SAL_CALL hwp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * )
{ {
void * pRet = 0; void * pRet = 0;
......
...@@ -469,12 +469,8 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) ...@@ -469,12 +469,8 @@ 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 );
} }
#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 ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
......
...@@ -17,7 +17,7 @@ ...@@ -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="reflection"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.stoc.CoreReflection"> <implementation name="com.sun.star.comp.stoc.CoreReflection">
<service name="com.sun.star.reflection.CoreReflection"/> <service name="com.sun.star.reflection.CoreReflection"/>
......
...@@ -17,7 +17,7 @@ ...@@ -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="introspection"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.stoc.Introspection"> <implementation name="com.sun.star.comp.stoc.Introspection">
<service name="com.sun.star.beans.Introspection"/> <service name="com.sun.star.beans.Introspection"/>
......
...@@ -2874,13 +2874,9 @@ Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Referen ...@@ -2874,13 +2874,9 @@ Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Referen
} }
#ifdef DISABLE_DYNLOADING
#define component_getFactory introspection_component_getFactory
#endif
extern "C" 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, const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * ) SAL_UNUSED_PARAMETER void * )
{ {
......
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