From b2206faadd7729350b9bc0d530be1ccd99eede8e Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Mon, 18 Apr 2005 08:22:50 +0000
Subject: INTEGRATION: CWS presfixes03 (1.19.4); FILE MERGED 2005/04/14
 12:08:54 thb 1.19.4.1: #i46805# The GraphicCache errorneously used a cached
 bitmap, prepared for a monochrome VDev with draw mode BLACKBITMAP, for normal
 output. Fixed by a) ruling out BLACK/WHITE_BITMAP for caching at all, and b)
 storing both bit depth and draw mode of target outdev in the
 DisplayCacheEntry

---
 goodies/source/graphic/grfmgr2.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'goodies')

diff --git a/goodies/source/graphic/grfmgr2.cxx b/goodies/source/graphic/grfmgr2.cxx
index c8ba5058a23a..9eca023cc14a 100644
--- a/goodies/source/graphic/grfmgr2.cxx
+++ b/goodies/source/graphic/grfmgr2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: grfmgr2.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: rt $ $Date: 2005-03-30 07:47:44 $
+ *  last change: $Author: obo $ $Date: 2005-04-18 09:22:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -299,7 +299,10 @@ BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
         {
             const BitmapEx aSrcBmpEx( rGraphic.GetBitmapEx() );
 
-            if( mpCache->IsDisplayCacheable( pOut, rPt, rSz, rObj, rAttr ) )
+            // #i46805# No point in caching a bitmap that is rendered
+            // via RectFill on the OutDev
+            if( !(pOut->GetDrawMode() & ( DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP )) &&
+                mpCache->IsDisplayCacheable( pOut, rPt, rSz, rObj, rAttr ) )
             {
                 BitmapEx aDstBmpEx;
 
-- 
cgit