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

Adapt Windows-only code

Browse Source 
...to b8793748b0 "Seems more natural to pass a
homogenous list by initializer_list"

Change-Id: I1c6816a442b57572a307251de1de5652a9d2a63a
This commit is contained in:
Stephan Bergmann
2015-11-20 16:28:27 +01:00
parent 4f4a4d7eb6
commit 8f7025b50f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,8 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace sdecl = comphelper::service_decl;
namespace dxcanvas namespace dxcanvas
{ {
/// Actual canonical implementation of the GraphicsProvider interface /// Actual canonical implementation of the GraphicsProvider interface
@@ -217,7 +219,6 @@ namespace dxcanvas
return xRet; return xRet;
} }
namespace sdecl = comphelper::service_decl;
sdecl::class_<Canvas, sdecl::with_args<true> > serviceImpl1(&initCanvas); sdecl::class_<Canvas, sdecl::with_args<true> > serviceImpl1(&initCanvas);
const sdecl::ServiceDecl dxCanvasDecl( const sdecl::ServiceDecl dxCanvasDecl(
serviceImpl1, serviceImpl1,
@@ -244,7 +245,7 @@ extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL gdipluscanvas_component_getFactory( sal_Char const* pImplName, SAL_DLLPUBLIC_EXPORT void* SAL_CALL gdipluscanvas_component_getFactory( sal_Char const* pImplName,
void*, void* ) 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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

@@ -49,6 +49,8 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace sdecl = comphelper::service_decl;
namespace dxcanvas namespace dxcanvas
{ {
SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >& aArguments, SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >& aArguments,
@@ -178,7 +180,6 @@ namespace dxcanvas
return xRet; return xRet;
} }
namespace sdecl = comphelper::service_decl;
sdecl::class_<SpriteCanvas, sdecl::with_args<true> > serviceImpl(&initCanvas); sdecl::class_<SpriteCanvas, sdecl::with_args<true> > serviceImpl(&initCanvas);
const sdecl::ServiceDecl dxSpriteCanvasDecl( const sdecl::ServiceDecl dxSpriteCanvasDecl(
serviceImpl, serviceImpl,
@@ -191,7 +192,7 @@ extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL directx9canvas_component_getFactory( sal_Char const* pImplName, SAL_DLLPUBLIC_EXPORT void* SAL_CALL directx9canvas_component_getFactory( sal_Char const* pImplName,
void*, void* ) void*, void* )
{ {
return component_getFactoryHelper( pImplName, dxcanvas::dxSpriteCanvasDecl ); return sdecl::component_getFactoryHelper( pImplName, {&dxcanvas::dxSpriteCanvasDecl} );
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */