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

Add COMPHELPER_SERVICEDECL_EXPORTS* back in, after libmerge changes

Browse Source 
Did I mention I hate boilerplate copied all over the place? ;)
This commit is contained in:
Thorsten Behrens 2012-03-16 15:50:44 +01:00
parent d32cf8d820
commit 80fe015a86
13 changed files with 35 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
canvas/Library_nullcanvas.mk
View File

@ -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 \

11
canvas/source/cairo/cairo_services.cxx
View File

@ -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: */

12
canvas/source/directx/dx_canvas.cxx
View File

@ -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: */

10
canvas/source/directx/dx_spritecanvas.cxx
View File

@ -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: */

10
canvas/source/null/null_spritecanvas.cxx
View File

@ -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: */

10
canvas/source/simplecanvas/simplecanvasimpl.cxx
View File

@ -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: */

10
canvas/source/vcl/services.cxx
View File

@ -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: */

40
comphelper/inc/comphelper/servicedecl.hxx
View File

@ -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)

10
cppcanvas/source/uno/uno_mtfrenderer.cxx
View File

@ -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: */

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

@ -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: */

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

@ -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: */

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

@ -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: */

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

@ -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: */