include/vcl/outdev.hxx | 1 - vcl/source/gdi/bitmap.cxx | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit a81027b13f1696c1cb2e8bcae3d712a193ff2dfd Author: Chris Sherlock <[email protected]> Date: Fri Nov 21 19:12:38 2014 +1100 vcl: remove ::Bitmap as friend of OutputDevice Change-Id: Idea0fee1ca79ae1660e89ef7038b35cf27358082 Reviewed-on: https://gerrit.libreoffice.org/13013 Reviewed-by: Chris Sherlock <[email protected]> Tested-by: Chris Sherlock <[email protected]> diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index e1a9ca4..ac8462a 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -255,7 +255,6 @@ extern const sal_uLong nVCLLut[ 256 ]; class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable { - friend class ::Bitmap; friend class ImplImageBmp; friend class Printer; friend class System; diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index c034b27..69a6ecf 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; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
