diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-18 08:22:50 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-18 08:22:50 +0000 |
| commit | b2206faadd7729350b9bc0d530be1ccd99eede8e (patch) | |
| tree | b5cb9f78c113497ab38b0191cda0cf02f2d8279a /goodies | |
| parent | fd539a6d02fd7a68ad6a1d26c32644c0eb0838f2 (diff) | |
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
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/graphic/grfmgr2.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
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; |