vcl: remove ::Bitmap as friend of OutputDevice

Change-Id: Idea0fee1ca79ae1660e89ef7038b35cf27358082
Reviewed-on: https://gerrit.libreoffice.org/13013Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>

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;

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;