diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2012-03-16 15:50:44 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-03-16 17:02:23 +0100 |
| commit | 80fe015a86c90db2bcbfcd382eb24c8b7069fa3a (patch) | |
| tree | bfe90c47d76ac21ee493459f0fc4151da804fa83 /canvas/source/directx | |
| parent | d32cf8d820be839c7303e3c5962c17f64cac2812 (diff) | |
Add COMPHELPER_SERVICEDECL_EXPORTS* back in, after libmerge changes
Did I mention I hate boilerplate copied all over the place? ;)
Diffstat (limited to 'canvas/source/directx')
| -rw-r--r-- | canvas/source/directx/dx_canvas.cxx | 12 | ||||
| -rw-r--r-- | canvas/source/directx/dx_spritecanvas.cxx | 10 |
2 files changed, 4 insertions, 18 deletions
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: */ |