diff options
Diffstat (limited to 'canvas/source/directx')
-rw-r--r-- | canvas/source/directx/directx5canvas.component | 2 | ||||
-rw-r--r-- | canvas/source/directx/directx9canvas.component | 2 | ||||
-rw-r--r-- | canvas/source/directx/dx_canvas.cxx | 11 | ||||
-rw-r--r-- | canvas/source/directx/dx_spritecanvas.cxx | 10 | ||||
-rw-r--r-- | canvas/source/directx/gdipluscanvas.component | 2 |
5 files changed, 21 insertions, 6 deletions
diff --git a/canvas/source/directx/directx5canvas.component b/canvas/source/directx/directx5canvas.component index 80133e724df6..f7bcdbffe517 100644 --- a/canvas/source/directx/directx5canvas.component +++ b/canvas/source/directx/directx5canvas.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="directx5canvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.SpriteCanvas.DX5"> <service name="com.sun.star.rendering.SpriteCanvas.DX5"/> diff --git a/canvas/source/directx/directx9canvas.component b/canvas/source/directx/directx9canvas.component index 0d395892d4cb..dc0349bfbf96 100644 --- a/canvas/source/directx/directx9canvas.component +++ b/canvas/source/directx/directx9canvas.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="directx9canvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.SpriteCanvas.DX9"> <service name="com.sun.star.rendering.SpriteCanvas.DX9"/> diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index c29319b3974e..18d894035560 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -252,7 +252,14 @@ namespace dxcanvas } // The C shared lib entry points -COMPHELPER_SERVICEDECL_EXPORTS2(dxcanvas::dxCanvasDecl, - dxcanvas::dxBitmapCanvasDecl); +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 ); +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx index 430f4639cb92..6c4739203caa 100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx @@ -209,6 +209,14 @@ namespace dxcanvas } // The C shared lib entry points -COMPHELPER_SERVICEDECL_EXPORTS1(dxcanvas::dxSpriteCanvasDecl); +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 ); +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/gdipluscanvas.component b/canvas/source/directx/gdipluscanvas.component index e39e77444d59..8845e8c6dfc2 100644 --- a/canvas/source/directx/gdipluscanvas.component +++ b/canvas/source/directx/gdipluscanvas.component @@ -26,7 +26,7 @@ * **********************************************************************--> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="gdipluscanvas" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.rendering.BitmapCanvas.GDI+"> <service name="com.sun.star.rendering.BitmapCanvas.GDI+"/> |