add prefixes for component_getFactory

14 files changed, 46 insertions, 24 deletions

diff --git a/animations/source/animcore/animcore.component b/animations/source/animcore/animcore.component
index 1a9a390fb..e0d28e164 100644
--- a/animations/source/animcore/animcore.component
+++ b/animations/source/animcore/animcore.component
@@ -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"/>
diff --git a/animations/source/animcore/factreg.cxx b/animations/source/animcore/factreg.cxx
index d297f6f0d..ec5a5210b 100644
--- a/animations/source/animcore/factreg.cxx
+++ b/animations/source/animcore/factreg.cxx
@@ -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 );
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 69c231aba..6cf83a76c 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -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 );
 }
diff --git a/sd/source/ui/unoidl/detreg.cxx b/sd/source/ui/unoidl/detreg.cxx
index 82ed24e28..060205f09 100644
--- a/sd/source/ui/unoidl/detreg.cxx
+++ b/sd/source/ui/unoidl/detreg.cxx
@@ -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*  )
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index a7b8cf1f4..4d358ec57 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -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           *  )
diff --git a/sd/util/sd.component b/sd/util/sd.component
index 0d0011b48..23102584e 100644
--- a/sd/util/sd.component
+++ b/sd/util/sd.component
@@ -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"/>
diff --git a/sd/util/sdd.component b/sd/util/sdd.component
index 51160d0f0..0bf634197 100644
--- a/sd/util/sdd.component
+++ b/sd/util/sdd.component
@@ -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"/>
diff --git a/sd/util/sdfilt.component b/sd/util/sdfilt.component
index 397d31cf6..17f09f45c 100644
--- a/sd/util/sdfilt.component
+++ b/sd/util/sdfilt.component
@@ -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"/>
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 9200f4c94..002712530 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -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 );
+}
+}
diff --git a/slideshow/source/engine/OGLTrans/ogltrans.component b/slideshow/source/engine/OGLTrans/ogltrans.component
index 89f2384b0..f0a2a97ad 100644
--- a/slideshow/source/engine/OGLTrans/ogltrans.component
+++ b/slideshow/source/engine/OGLTrans/ogltrans.component
@@ -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"/>
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
index 02a5e25f8..fad212523 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
@@ -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: */
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
index a46e73c59..9474d0357 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
@@ -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: */
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 2e2f4fa6c..18b81a1d6 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -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: */
diff --git a/slideshow/util/slideshow.component b/slideshow/util/slideshow.component
index 540c586f1..5c1379825 100644
--- a/slideshow/util/slideshow.component
+++ b/slideshow/util/slideshow.component
@@ -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"/>