From b90e098a354323b635bab3ee8f9c79deb1e734fe Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 14 Feb 2018 11:20:32 +0200 Subject: use BitmapEx in LwpBackgroundStuff part of making Bitmap an implementation detail of vcl/ Change-Id: I847a2371cd630637b11aed0fad7263809143c706 Reviewed-on: https://gerrit.libreoffice.org/49705 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/xoutdev/xattrbmp.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'svx') diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index fad22b1c546d..6bb58e9707bb 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star; -XOBitmap::XOBitmap( const Bitmap& rBmp ) : +XOBitmap::XOBitmap( const BitmapEx& rBmp ) : xGraphicObject (new GraphicObject(rBmp)), bGraphicDirty ( false ) { @@ -54,9 +54,9 @@ XOBitmap::~XOBitmap() { } -Bitmap XOBitmap::GetBitmap() const +BitmapEx XOBitmap::GetBitmap() const { - return GetGraphicObject().GetGraphic().GetBitmap(); + return GetGraphicObject().GetGraphic().GetBitmapEx(); } const GraphicObject& XOBitmap::GetGraphicObject() const @@ -71,14 +71,14 @@ void XOBitmap::Bitmap2Array() { ScopedVclPtrInstance< VirtualDevice > pVDev; bool bPixelColor = false; - const Bitmap aBitmap( GetBitmap() ); + const BitmapEx aBitmap( GetBitmap() ); const sal_Int32 nLines = 8; // type dependent if( !pPixelArray ) pPixelArray.reset( new sal_uInt16[ nLines * nLines ] ); pVDev->SetOutputSizePixel( aBitmap.GetSizePixel() ); - pVDev->DrawBitmap( Point(), aBitmap ); + pVDev->DrawBitmapEx( Point(), aBitmap ); aPixelColor = aBckgrColor = pVDev->GetPixel( Point() ); // create array and determine foreground and background color -- cgit