ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

remove dead code from WinSalBitmap::Create

Browse Source 
Change-Id: I345bfba23d6041a631664f5e1dbbe27cd8ba0290
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114271
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2021-04-19 18:39:00 +02:00
committed by Noel Grandin
parent da3d3fad15
commit 4bb0afe359
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/inc/win/salbmp.h
+1 -1
View File
@@ -63,7 +63,7 @@ public:
public:
bool Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle );
bool Create( HANDLE hBitmap );
virtual bool Create( const Size& rSize, vcl::PixelFormat ePixelFormat, const BitmapPalette& rPal ) override;
virtual bool Create( const SalBitmap& rSalBmpImpl ) override;
virtual bool Create( const SalBitmap& rSalBmpImpl, SalGraphics* pGraphics ) override;
vcl/win/gdi/gdiimpl.cxx
+1 -1
View File
@@ -820,7 +820,7 @@ std::shared_ptr<SalBitmap> WinSalGraphicsImpl::getBitmap( tools::Long nX, tools:
{
pSalBitmap = std::make_shared<WinSalBitmap>();
if( !pSalBitmap->Create( hBmpBitmap, false, false ) )
if( !pSalBitmap->Create( hBmpBitmap ) )
{
pSalBitmap.reset();
}
vcl/win/gdi/salbmp.cxx
+3 -6
View File
@@ -459,14 +459,11 @@ std::shared_ptr<Gdiplus::Bitmap> WinSalBitmap::ImplCreateGdiPlusBitmap(const Win
return pRetval;
}
bool WinSalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle )
bool WinSalBitmap::Create( HANDLE hBitmap )
{
bool bRet = true;
if( bDIB )
mhDIB = static_cast<HGLOBAL>( bCopyHandle ? ImplCopyDIBOrDDB( hBitmap, true ) : hBitmap );
else
mhDDB = static_cast<HBITMAP>( bCopyHandle ? ImplCopyDIBOrDDB( hBitmap, false ) : hBitmap );
mhDDB = static_cast<HBITMAP>( hBitmap );
if( mhDIB )
{
@@ -656,7 +653,7 @@ bool WinSalBitmap::Create( const css::uno::Reference< css::rendering::XBitmapCan
sal_Int64 aHBmp64;
if( args[0] >>= aHBmp64 ) {
return Create( reinterpret_cast<HANDLE>(aHBmp64), false, false );
return Create( reinterpret_cast<HANDLE>(aHBmp64) );
}
}
}