diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-11-21 19:12:38 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-11-21 22:35:20 +0000 |
| commit | a81027b13f1696c1cb2e8bcae3d712a193ff2dfd (patch) | |
| tree | 0b002edb135415a7a916b2880f57aa2282f89125 | |
| parent | 186d021c157ddcbe98474dd347c80e8dcc7ab471 (diff) | |
vcl: remove ::Bitmap as friend of OutputDevice
Change-Id: Idea0fee1ca79ae1660e89ef7038b35cf27358082
Reviewed-on: https://gerrit.libreoffice.org/13013
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
| -rw-r--r-- | include/vcl/outdev.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/gdi/bitmap.cxx | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index e1a9ca4d5f0c..ac8462a453d1 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 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; |