summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--canvas/Library_nullcanvas.mk2
-rw-r--r--canvas/source/cairo/cairo_services.cxx11
-rw-r--r--canvas/source/directx/dx_canvas.cxx12
-rw-r--r--canvas/source/directx/dx_spritecanvas.cxx10
-rw-r--r--canvas/source/null/null_spritecanvas.cxx10
-rw-r--r--canvas/source/simplecanvas/simplecanvasimpl.cxx10
-rw-r--r--canvas/source/vcl/services.cxx10
-rw-r--r--comphelper/inc/comphelper/servicedecl.hxx40
-rw-r--r--cppcanvas/source/uno/uno_mtfrenderer.cxx10
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm10
-rw-r--r--slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx10
-rw-r--r--slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx10
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx10
13 files changed, 35 insertions, 120 deletions
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index 52e99de5ccd2..24050ff43abb 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -28,6 +28,8 @@
$(eval $(call gb_Library_Library,nullcanvas))
+$(eval $(call gb_Library_set_componentfile,nullcanvas,canvas/source/null/nullcanvas))
+
$(eval $(call gb_Library_set_include,nullcanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx
index 9f99f274909f..dfb694f01576 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <canvas/debug.hxx>
#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
@@ -79,14 +78,6 @@ namespace cairocanvas
}
// The C shared lib entry points
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL cairocanvas_component_getFactory( sal_Char const* pImplName,
- ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
- ::com::sun::star::registry::XRegistryKey* pRegistryKey )
-{
- return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, cairocanvas::cairoCanvasDecl, cairocanvas::cairoSpriteCanvasDecl );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS2(cairocanvas, cairocanvas::cairoCanvasDecl, cairocanvas::cairoSpriteCanvasDecl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index dd5d5a80d91f..45056f95c084 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -250,14 +250,8 @@ namespace dxcanvas
}
// The C shared lib entry points
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL gdipluscanvas_component_getFactory( sal_Char const* pImplName,
- ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
- ::com::sun::star::registry::XRegistryKey* pRegistryKey )
-{
- return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, dxcanvas::dxCanvasDecl, dxcanvas::dxBitmapCanvasDecl );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS2(gdipluscanvas,
+ dxcanvas::dxCanvasDecl,
+ dxcanvas::dxBitmapCanvasDecl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 24785b5a9b8e..cecc99c1da05 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -207,14 +207,6 @@ namespace dxcanvas
}
// The C shared lib entry points
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL directx9canvas_component_getFactory( sal_Char const* pImplName,
- ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
- ::com::sun::star::registry::XRegistryKey* pRegistryKey )
-{
- return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, dxcanvas::dxSpriteCanvasDecl );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS1(directx9canvas, dxcanvas::dxSpriteCanvasDecl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/null/null_spritecanvas.cxx b/canvas/source/null/null_spritecanvas.cxx
index b3a0bcb150f3..53d918b7c5d4 100644
--- a/canvas/source/null/null_spritecanvas.cxx
+++ b/canvas/source/null/null_spritecanvas.cxx
@@ -162,14 +162,6 @@ namespace nullcanvas
}
// The C shared lib entry points
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( sal_Char const* pImplName,
- ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
- ::com::sun::star::registry::XRegistryKey* pRegistryKey )
-{
- return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, nullcanvas::nullCanvasDecl );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS1(nullcanvas, nullcanvas::nullCanvasDecl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index 57a8888c2547..57102fb69f5e 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -390,14 +390,6 @@ namespace
}
// The C shared lib entry points
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL simplecanvas_component_getFactory( sal_Char const* pImplName,
- ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
- ::com::sun::star::registry::XRegistryKey* pRegistryKey )
-{
- return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, simpleCanvasDecl );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS1(simplecanvas, simpleCanvasDecl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx
index 2b5fbe42b592..1b59bb590623 100644
--- a/canvas/source/vcl/services.cxx
+++ b/canvas/source/vcl/services.cxx
@@ -86,14 +86,6 @@ namespace vclcanvas
}
// The C shared lib entry points
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL vclcanvas_component_getFactory( sal_Char const* pImplName,
- ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
- ::com::sun::star::registry::XRegistryKey* pRegistryKey )
-{
- return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vclcanvas::vclCanvasDecl, vclcanvas::vclSpriteCanvasDecl );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS2(vclcanvas, vclcanvas::vclCanvasDecl, vclcanvas::vclSpriteCanvasDecl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index c5ab4b79f5f7..31956a4475f8 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -384,12 +384,12 @@ BOOST_PP_REPEAT_FROM_TO(1, COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS,
Note the missing colons between the bracketed arguments.
*/
-#define COMPHELPER_SERVICEDECL_make_exports(varargs_ ) \
+#define COMPHELPER_SERVICEDECL_make_exports(compName, varargs_ ) \
extern "C" \
{ \
- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( sal_Char const* pImplName, \
- ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, \
- ::com::sun::star::registry::XRegistryKey* pRegistryKey ) \
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL compName##_component_getFactory( sal_Char const* pImplName, \
+ ::com::sun::star::lang::XMultiServiceFactory* pServiceManager, \
+ ::com::sun::star::registry::XRegistryKey* pRegistryKey ) \
{ \
return component_getFactoryHelper( pImplName, pServiceManager, \
pRegistryKey, \
@@ -397,22 +397,22 @@ extern "C" \
} \
}
-#define COMPHELPER_SERVICEDECL_EXPORTS1(comp0_) \
- COMPHELPER_SERVICEDECL_make_exports((comp0_))
-#define COMPHELPER_SERVICEDECL_EXPORTS2(comp0_,comp1_) \
- COMPHELPER_SERVICEDECL_make_exports((comp0_)(comp1_))
-#define COMPHELPER_SERVICEDECL_EXPORTS3(comp0_,comp1_,comp2_) \
- COMPHELPER_SERVICEDECL_make_exports((comp0_)(comp1_)(comp2_))
-#define COMPHELPER_SERVICEDECL_EXPORTS4(comp0_,comp1_,comp2_,comp3_) \
- COMPHELPER_SERVICEDECL_make_exports((comp0_)(comp1_)(comp2_)(comp3_))
-#define COMPHELPER_SERVICEDECL_EXPORTS5(comp0_,comp1_,comp2_,comp3_,comp4_) \
- COMPHELPER_SERVICEDECL_make_exports((comp0_)(comp1_)(comp2_)(comp3_)(comp4_))
-#define COMPHELPER_SERVICEDECL_EXPORTS6(comp0_,comp1_,comp2_,comp3_,comp4_,comp5_) \
- COMPHELPER_SERVICEDECL_make_exports((comp0_)(comp1_)(comp2_)(comp3_)(comp4_)(comp5_))
-#define COMPHELPER_SERVICEDECL_EXPORTS7(comp0_,comp1_,comp2_,comp3_,comp4_,comp5_,comp6_) \
- COMPHELPER_SERVICEDECL_make_exports((comp0_)(comp1_)(comp2_)(comp3_)(comp4_)(comp5_)(comp6_))
-#define COMPHELPER_SERVICEDECL_EXPORTS8(comp0_,comp1_,comp2_,comp3_,comp4_,comp5_,comp6_,comp7_) \
- COMPHELPER_SERVICEDECL_make_exports((comp0_)(comp1_)(comp2_)(comp3_)(comp4_)(comp5_)(comp6_)(comp7_))
+#define COMPHELPER_SERVICEDECL_EXPORTS1(compName,comp0_) \
+ COMPHELPER_SERVICEDECL_make_exports(compName,(comp0_))
+#define COMPHELPER_SERVICEDECL_EXPORTS2(compName,comp0_,comp1_) \
+ COMPHELPER_SERVICEDECL_make_exports(compName,(comp0_)(comp1_))
+#define COMPHELPER_SERVICEDECL_EXPORTS3(compName,comp0_,comp1_,comp2_) \
+ COMPHELPER_SERVICEDECL_make_exports(compName,(comp0_)(comp1_)(comp2_))
+#define COMPHELPER_SERVICEDECL_EXPORTS4(compName,comp0_,comp1_,comp2_,comp3_) \
+ COMPHELPER_SERVICEDECL_make_exports(compName,(comp0_)(comp1_)(comp2_)(comp3_))
+#define COMPHELPER_SERVICEDECL_EXPORTS5(compName,comp0_,comp1_,comp2_,comp3_,comp4_) \
+ COMPHELPER_SERVICEDECL_make_exports(compName,(comp0_)(comp1_)(comp2_)(comp3_)(comp4_))
+#define COMPHELPER_SERVICEDECL_EXPORTS6(compName,comp0_,comp1_,comp2_,comp3_,comp4_,comp5_) \
+ COMPHELPER_SERVICEDECL_make_exports(compName,(comp0_)(comp1_)(comp2_)(comp3_)(comp4_)(comp5_))
+#define COMPHELPER_SERVICEDECL_EXPORTS7(compName,comp0_,comp1_,comp2_,comp3_,comp4_,comp5_,comp6_) \
+ COMPHELPER_SERVICEDECL_make_exports(compName,(comp0_)(comp1_)(comp2_)(comp3_)(comp4_)(comp5_)(comp6_))
+#define COMPHELPER_SERVICEDECL_EXPORTS8(compName,comp0_,comp1_,comp2_,comp3_,comp4_,comp5_,comp6_,comp7_) \
+ COMPHELPER_SERVICEDECL_make_exports(compName,(comp0_)(comp1_)(comp2_)(comp3_)(comp4_)(comp5_)(comp6_)(comp7_))
#endif // ! defined(COMPHELPER_SERVICEDECL_HXX_INCLUDED)
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx
index dacaeab7d1db..ab480af456f5 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.cxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx
@@ -72,14 +72,6 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.rendering.MtfRenderer" );
// The C shared lib entry points
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL mtfrenderer_component_getFactory( sal_Char const* pImplName,
- ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
- ::com::sun::star::registry::XRegistryKey* pRegistryKey )
-{
- return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, MtfRendererDecl );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS1(mtfrenderer, MtfRendererDecl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index f3bfab40f664..8d2ab4e8a21d 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -1124,14 +1124,6 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.presentation.TransitionFactory" );
// The C shared lib entry points
-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 );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS1(ogltrans, OGLTransitionFactoryDecl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
index 1f301e60fd99..b82f41cae656 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
@@ -1470,14 +1470,6 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.presentation.TransitionFactory" );
// The C shared lib entry points
-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 );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS1(ogltrans, 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 7aa72062d662..091dc2042b69 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
@@ -1442,14 +1442,6 @@ const sdecl::ServiceDecl OGLTransitionFactoryDecl(
"com.sun.star.presentation.TransitionFactory" );
// The C shared lib entry points
-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 );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS1(ogltrans, OGLTransitionFactoryDecl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 864c412cbf9b..2ff3e8cf556c 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2456,14 +2456,6 @@ const sdecl::ServiceDecl slideShowDecl(
"com.sun.star.presentation.SlideShow" );
// The C shared lib entry points
-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 );
-}
-}
+COMPHELPER_SERVICEDECL_EXPORTS1(slideshow, slideShowDecl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 23:42:00 +0000