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

add prefixes for component_getFactory

Browse Source
This commit is contained in:
Matúš Kukan
2011-07-28 14:37:59 +02:00
parent 58707d613f
commit 7e5b4be4cf
14 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
animations/source/animcore/animcore.component
View File

@@ -26,7 +26,7 @@
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
<component loader="com.sun.star.loader.SharedLibrary" prefix="animcore"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="animcore::Animate">
<service name="com.sun.star.animations.Animate"/>

8
animations/source/animcore/factreg.cxx
View File

@@ -74,13 +74,7 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
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 animcore_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );

6
sd/source/filter/eppt/pptx-epptooxml.cxx
View File

@@ -2236,11 +2236,7 @@ extern "C"
{
#endif
// ------------------------
// - component_getFactory -
// ------------------------
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdfilt_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
{
return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
}

2
sd/source/ui/unoidl/detreg.cxx
View File

@@ -42,7 +42,7 @@ using namespace ::com::sun::star::lang;
extern "C" {
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdd_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* )

2
sd/source/ui/unoidl/facreg.cxx
View File

@@ -297,7 +297,7 @@ static ::boost::shared_ptr<FactoryMap> spFactoryMap;
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory(
const sal_Char * pImplName,
void * pServiceManager,
void * )

2
sd/util/sd.component
View File

@@ -26,7 +26,7 @@
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
<component loader="com.sun.star.loader.SharedLibrary" prefix="sd"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Draw.DrawingDocument">
<service name="com.sun.star.drawing.DrawingDocument"/>

2
sd/util/sdd.component
View File

@@ -26,7 +26,7 @@
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
<component loader="com.sun.star.loader.SharedLibrary" prefix="sdd"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.draw.FormatDetector">
<service name="com.sun.star.frame.ExtendedTypeDetection"/>

2
sd/util/sdfilt.component
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<component loader="com.sun.star.loader.SharedLibrary"
<component loader="com.sun.star.loader.SharedLibrary" prefix="sdfilt"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Impress.oox.PowerPointExport">
<service name="com.sun.star.comp.ooxpptx"/>

10
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
View File

@@ -1129,4 +1129,12 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.presentation.TransitionFactory" );
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS1(OGLTransitionFactoryDecl)
extern "C"
{
SAL_DLLPUBLIC_EXPORT void* SAL_CALL ogltrans_component_getFactory( sal_Char const* pImplName,
::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
::com::sun::star::registry::XRegistryKey* pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, OGLTransitionFactoryDecl );
}
}

2
slideshow/source/engine/OGLTrans/ogltrans.component
View File

@@ -26,7 +26,7 @@
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
<component loader="com.sun.star.loader.SharedLibrary" prefix="ogltrans"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.presentation.OGLTransitionFactory">
<service name="com.sun.star.presentation.TransitionFactory"/>

10
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
View File

@@ -1477,6 +1477,14 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.presentation.TransitionFactory" );
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS1(OGLTransitionFactoryDecl)
extern "C"
{
SAL_DLLPUBLIC_EXPORT void* SAL_CALL ogltrans_component_getFactory( sal_Char const* pImplName,
::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
::com::sun::star::registry::XRegistryKey* pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, OGLTransitionFactoryDecl );
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

10
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
View File

@@ -1450,6 +1450,14 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.presentation.TransitionFactory" );
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS1(OGLTransitionFactoryDecl)
extern "C"
{
SAL_DLLPUBLIC_EXPORT void* SAL_CALL ogltrans_component_getFactory( sal_Char const* pImplName,
::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
::com::sun::star::registry::XRegistryKey* pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, OGLTransitionFactoryDecl );
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

10
slideshow/source/engine/slideshowimpl.cxx
View File

@@ -2460,6 +2460,14 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.presentation.SlideShow" );
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS1(slideShowDecl)
extern "C"
{
SAL_DLLPUBLIC_EXPORT void* SAL_CALL slideshow_component_getFactory( sal_Char const* pImplName,
::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
::com::sun::star::registry::XRegistryKey* pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, slideShowDecl );
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
slideshow/util/slideshow.component
View File

@@ -26,7 +26,7 @@
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary"
<component loader="com.sun.star.loader.SharedLibrary" prefix="slideshow"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.presentation.SlideShow">
<service name="com.sun.star.presentation.SlideShow"/>