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

inline COMPHELPER_SERVICEDECL_ macro

Browse Source 
it was not adding any value

Change-Id: I6a911aac81e883f9155ed0cf24bfb7904efb3f92
This commit is contained in:
Noel Grandin
2015-06-12 16:04:07 +02:00
parent c3a8adb2e0
commit 1afb790a11
11 changed files with 62 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,11 @@ namespace cairocanvas
}
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS2(cairocanvas, cairocanvas::cairoCanvasDecl, cairocanvas::cairoSpriteCanvasDecl)
extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL cairocanvas_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return component_getFactoryHelper( pImplName, cairocanvas::cairoCanvasDecl, cairocanvas::cairoSpriteCanvasDecl );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

@@ -240,8 +240,11 @@ namespace dxcanvas
}
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS2(gdipluscanvas,
dxcanvas::dxCanvasDecl,
dxcanvas::dxBitmapCanvasDecl)
extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL gdipluscanvas_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return component_getFactoryHelper( pImplName, dxcanvas::dxCanvasDecl, dxcanvas::dxBitmapCanvasDecl );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

@@ -191,6 +191,11 @@ namespace dxcanvas
}
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS1(directx9canvas, dxcanvas::dxSpriteCanvasDecl)
extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL directx9canvas_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return component_getFactoryHelper( pImplName, dxcanvas::dxSpriteCanvasDecl );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

7
canvas/source/opengl/ogl_spritecanvas.cxx
View File

@@ -186,6 +186,11 @@ namespace oglcanvas
}
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS1(oglcanvas, oglcanvas::oglSpriteCanvasDecl);
extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL oglcanvas_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return component_getFactoryHelper( pImplName, oglcanvas::oglSpriteCanvasDecl );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

@@ -383,6 +383,10 @@ namespace
}
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS1(simplecanvas, simpleCanvasDecl)
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL simplecanvas_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return component_getFactoryHelper( pImplName, simpleCanvasDecl );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

@@ -77,6 +77,11 @@ namespace vclcanvas
}
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS2(vclcanvas, vclcanvas::vclCanvasDecl, vclcanvas::vclSpriteCanvasDecl)
extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL vclcanvas_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return component_getFactoryHelper( pImplName, vclcanvas::vclCanvasDecl, vclcanvas::vclSpriteCanvasDecl );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

@@ -52,6 +52,11 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.rendering.MtfRenderer" );
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS1(mtfrenderer, MtfRendererDecl)
extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL mtfrenderer_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return component_getFactoryHelper( pImplName, MtfRendererDecl );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

53
include/comphelper/servicedecl.hxx
View File

@@ -377,59 +377,6 @@ BOOST_PP_REPEAT_FROM_TO(1, COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS,
} // namespace service_decl
} // namespace comphelper
/** The following preprocessor macro generates the C access functions,
that are used to initialize and register the components of a
shared library object.
If you have, say, written a lib that contains three distinct
components, each with its own ServiceDecl object, you might want
to employ the following code:
<pre>
// must reside outside _any_ namespace
COMPHELPER_SERVICEDECL_EXPORTS3(yourServiceDecl1,
yourServiceDecl2,
yourServiceDecl3);
</pre>
For your convenience, the COMPHELPER_SERVICEDECL_EXPORTS<N> macro
comes pre-defined up to N=8, if you should need more arguments,
call COMPHELPER_SERVICEDECL_make_exports directly, like this:
<pre>
// must reside outside _any_ namespace
COMPHELPER_SERVICEDECL_make_exports((yourServiceDecl1)(yourServiceDecl2)...(yourServiceDeclN));
</pre>
Note the missing colons between the bracketed arguments.
*/
#define COMPHELPER_SERVICEDECL_make_exports(compName, varargs_ ) \
extern "C" \
{ \
SAL_DLLPUBLIC_EXPORT void* SAL_CALL compName##_component_getFactory( sal_Char const* pImplName, \
void*, void* ) \
{ \
return component_getFactoryHelper( pImplName, \
BOOST_PP_SEQ_ENUM(varargs_) ); \
} \
}
#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( INCLUDED_COMPHELPER_SERVICEDECL_HXX)

12
shell/source/sessioninstall/services.cxx
View File

@@ -20,11 +20,17 @@ const sdecl::ServiceDecl SyncDbusSessionHelperServiceDecl(
"org.libreoffice.comp.shell.sessioninstall.SyncDbusSessionHelper",
"org.freedesktop.PackageKit.SyncDbusSessionHelper");
COMPHELPER_SERVICEDECL_EXPORTS1(losessioninstall, SyncDbusSessionHelperServiceDecl);
extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL losessioninstall_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
SAL_DLLPUBLIC_EXPORT void* SAL_CALL sessioninstall_component_getFactory( sal_Char const* pImplName, void* pServiceManager, void* pRegistryKey )
{ return losessioninstall_component_getFactory(pImplName, pServiceManager, pRegistryKey); }
return component_getFactoryHelper( pImplName, SyncDbusSessionHelperServiceDecl );
}
extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL sessioninstall_component_getFactory( sal_Char const* pImplName, void* pServiceManager, void* pRegistryKey )
{
return losessioninstall_component_getFactory(pImplName, pServiceManager, pRegistryKey);
}

7
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
View File

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

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

@@ -2470,6 +2470,11 @@ const sdecl::ServiceDecl slideShowDecl(
"com.sun.star.presentation.SlideShow" );
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS1(slideshow, slideShowDecl)
extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL slideshow_component_getFactory( sal_Char const* pImplName,
void*, void* )
{
return component_getFactoryHelper( pImplName, slideShowDecl );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */