From 6317e10f5b9c347ceb391e049e6d0f3c542f93c4 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 3 Feb 2020 16:26:38 +0100 Subject: loplugin:makeshared (clang-cl) Change-Id: I0c786bf401e514f9d86e33d8ab6366fc5dd1f425 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87887 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- canvas/source/directx/dx_canvas.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'canvas/source/directx/dx_canvas.cxx') diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index 3aace1190f08..39864b14e77d 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -18,6 +18,9 @@ */ #include + +#include + #include #include @@ -113,9 +116,8 @@ namespace dxcanvas maDeviceHelper.init( pSysData->hDC, pOutDev, *this ); maCanvasHelper.setDevice( *this ); maCanvasHelper.setTarget( - GraphicsProviderSharedPtr( - new GraphicsProviderImpl( - Gdiplus::Graphics::FromHDC(pSysData->hDC)))); + std::make_shared( + Gdiplus::Graphics::FromHDC(pSysData->hDC))); maArguments.realloc(0); } @@ -184,11 +186,11 @@ namespace dxcanvas throw lang::NoSupportException( "Passed HDC is no mem DC/has no bitmap selected!"); } - mpTarget.reset( new DXBitmap( + mpTarget = std::make_shared( BitmapSharedPtr( Gdiplus::Bitmap::FromHBITMAP( hBmp, nullptr) ), - false )); + false ); maCanvasHelper.setTarget( mpTarget ); -- cgit