summaryrefslogtreecommitdiff
path: root/goodies
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-10-19 11:43:49 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-10-19 11:43:49 +0000
commit51b5e5ce4e744c9e35b7557733c48bf329d8479e (patch)
treeefa419ab9237e320f5dfbfe60563f108ba68e159 /goodies
parent525860693fd8e5e95dd71ca918cf021c1cd28a69 (diff)
INTEGRATION: CWS cov2src (1.18.24); FILE MERGED
2005/10/18 08:56:13 rt 1.18.24.1: #126234# Join MWS COV680 m4 into SRC680
Diffstat (limited to 'goodies')
-rw-r--r--goodies/source/graphic/grfcache.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/goodies/source/graphic/grfcache.cxx b/goodies/source/graphic/grfcache.cxx
index 5a16e653c3be..d71602e6d72e 100644
--- a/goodies/source/graphic/grfcache.cxx
+++ b/goodies/source/graphic/grfcache.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: grfcache.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 03:04:09 $
+ * last change: $Author: rt $ $Date: 2005-10-19 12:43:49 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -492,7 +492,8 @@ public:
ULONG GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr )
{
- const GraphicType eType = rObj.GetGraphic().GetType();
+ const Graphic& rGraphic = rObj.GetGraphic();
+ const GraphicType eType = rGraphic.GetType();
ULONG nNeededSize;
if( GRAPHIC_BITMAP == eType )
@@ -519,7 +520,7 @@ ULONG GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point&
}
}
else if( GRAPHIC_GDIMETAFILE == eType )
- nNeededSize = 65535;
+ nNeededSize = rGraphic.GetSizeBytes();
else
nNeededSize = 0;