[Libreoffice-commits] core.git: canvas/source

[Stephan Bergmann]

 canvas/source/directx/dx_canvas.cxx       |    5 +++--
 canvas/source/directx/dx_spritecanvas.cxx |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 8f7025b50f50839a30565d2308dcf340bbf46a97
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 20 16:28:27 2015 +0100

    Adapt Windows-only code
    
    ...to b8793748b0eaaa3fe405587fcb2a3021adab833b "Seems more natural to pass a
    homogenous list by initializer_list"
    
    Change-Id: I1c6816a442b57572a307251de1de5652a9d2a63a

diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index f9e6ee1..854d386 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 bece243..b8dc36f 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: */