[Libreoffice-commits] .: animations/source sd/source sd/util slideshow/source slideshow/util
Matus Kukan
mkukan at kemper.freedesktop.org
Thu Jul 28 05:38:08 PDT 2011
animations/source/animcore/animcore.component | 2 +-
animations/source/animcore/factreg.cxx | 8 +-------
sd/source/filter/eppt/pptx-epptooxml.cxx | 6 +-----
sd/source/ui/unoidl/detreg.cxx | 2 +-
sd/source/ui/unoidl/facreg.cxx | 2 +-
sd/util/sd.component | 2 +-
sd/util/sdd.component | 2 +-
sd/util/sdfilt.component | 2 +-
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 10 +++++++++-
slideshow/source/engine/OGLTrans/ogltrans.component | 2 +-
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx | 10 +++++++++-
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 10 +++++++++-
slideshow/source/engine/slideshowimpl.cxx | 10 +++++++++-
slideshow/util/slideshow.component | 2 +-
14 files changed, 46 insertions(+), 24 deletions(-)
New commits:
commit f410fcc9dd7f7d4d1a631dd2c2f160788b71fc87
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Jul 28 14:37:59 2011 +0200
add prefixes for component_getFactory
diff --git a/animations/source/animcore/animcore.component b/animations/source/animcore/animcore.component
index 1a9a390..e0d28e1 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 d297f6f..ec5a521 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 69c231a..6cf83a7 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 82ed24e..060205f 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 a7b8cf1..4d358ec 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 0d0011b..2310258 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 51160d0..0bf6341 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 397d31c..17f09f4 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 9200f4c..0027125 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 89f2384..f0a2a97 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 02a5e25..fad2125 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 a46e73c..9474d03 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 2e2f4fa..18b81a1 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 540c586..5c13798 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"/>
More information about the Libreoffice-commits
mailing list