From a81027b13f1696c1cb2e8bcae3d712a193ff2dfd Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Fri, 21 Nov 2014 19:12:38 +1100 Subject: vcl: remove ::Bitmap as friend of OutputDevice Change-Id: Idea0fee1ca79ae1660e89ef7038b35cf27358082 Reviewed-on: https://gerrit.libreoffice.org/13013 Reviewed-by: Chris Sherlock Tested-by: Chris Sherlock --- vcl/source/gdi/bitmap.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index c034b2724094..69a6ecfaa575 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -1745,11 +1745,13 @@ Bitmap Bitmap::CreateDisplayBitmap( OutputDevice* pDisplay ) { Bitmap aDispBmp( *this ); - if( mpImpBmp && ( pDisplay->mpGraphics || pDisplay->AcquireGraphics() ) ) + SalGraphics* pDispGraphics = pDisplay->GetGraphics(); + + if( mpImpBmp && pDispGraphics ) { ImpBitmap* pImpDispBmp = new ImpBitmap; - if( pImpDispBmp->ImplCreate( *mpImpBmp, pDisplay->mpGraphics ) ) + if( pImpDispBmp->ImplCreate( *mpImpBmp, pDispGraphics ) ) aDispBmp.ImplSetImpBitmap( pImpDispBmp ); else delete pImpDispBmp; -- cgit