avoid some casting in WinSalBitmap
Change-Id: I0f18baf52131f229edb5be4bab723e954ba36cab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180532 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
This commit is contained in:
committed by
Noel Grandin
parent
744e7419e0
commit
2da756e0a8
@@ -67,7 +67,7 @@ public:
|
||||
|
||||
public:
|
||||
|
||||
bool Create( HANDLE hBitmap );
|
||||
bool Create( HBITMAP 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;
|
||||
|
||||
@@ -429,11 +429,11 @@ std::shared_ptr<Gdiplus::Bitmap> WinSalBitmap::ImplCreateGdiPlusBitmap(const Win
|
||||
return pRetval;
|
||||
}
|
||||
|
||||
bool WinSalBitmap::Create( HANDLE hBitmap )
|
||||
bool WinSalBitmap::Create( HBITMAP hBitmap )
|
||||
{
|
||||
bool bRet = true;
|
||||
|
||||
mhDDB = static_cast<HBITMAP>( hBitmap );
|
||||
mhDDB = hBitmap;
|
||||
|
||||
if( mhDIB )
|
||||
{
|
||||
@@ -620,7 +620,7 @@ bool WinSalBitmap::Create( const css::uno::Reference< css::rendering::XBitmapCan
|
||||
sal_Int64 aHBmp64;
|
||||
|
||||
if( args[0] >>= aHBmp64 ) {
|
||||
return Create( reinterpret_cast<HANDLE>(aHBmp64) );
|
||||
return Create( reinterpret_cast<HBITMAP>(aHBmp64) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user