diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-20 16:28:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-20 16:28:27 +0100 |
| commit | 8f7025b50f50839a30565d2308dcf340bbf46a97 (patch) | |
| tree | 08c1d94c7702b89edaab35b2597c0a86d1eeda3c /canvas | |
| parent | 4f4a4d7eb6438cb35a82545d59d01259ba79cc96 (diff) | |
Adapt Windows-only code
...to b8793748b0eaaa3fe405587fcb2a3021adab833b "Seems more natural to pass a
homogenous list by initializer_list"
Change-Id: I1c6816a442b57572a307251de1de5652a9d2a63a
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/directx/dx_canvas.cxx | 5 | ||||
| -rw-r--r-- | canvas/source/directx/dx_spritecanvas.cxx | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index f9e6ee1fa526..854d38628993 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -55,6 +55,8 @@ using namespace ::com::sun::star; +namespace sdecl = comphelper::service_decl; + namespace dxcanvas { /// Actual canonical implementation of the GraphicsProvider interface @@ -217,7 +219,6 @@ namespace dxcanvas return xRet; } - namespace sdecl = comphelper::service_decl; sdecl::class_<Canvas, sdecl::with_args<true> > serviceImpl1(&initCanvas); const sdecl::ServiceDecl dxCanvasDecl( serviceImpl1, @@ -244,7 +245,7 @@ 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 ); + return sdecl::component_getFactoryHelper( pImplName, {&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 bece2437e03c..b8dc36f989e6 100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx @@ -49,6 +49,8 @@ using namespace ::com::sun::star; +namespace sdecl = comphelper::service_decl; + namespace dxcanvas { SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >& aArguments, @@ -178,7 +180,6 @@ namespace dxcanvas return xRet; } - namespace sdecl = comphelper::service_decl; sdecl::class_<SpriteCanvas, sdecl::with_args<true> > serviceImpl(&initCanvas); const sdecl::ServiceDecl dxSpriteCanvasDecl( serviceImpl, @@ -191,7 +192,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL directx9canvas_component_getFactory( sal_Char const* pImplName, void*, void* ) { - return component_getFactoryHelper( pImplName, dxcanvas::dxSpriteCanvasDecl ); + return sdecl::component_getFactoryHelper( pImplName, {&dxcanvas::dxSpriteCanvasDecl} ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |