From 1494da147e3ed80346b95c4320d84f2dae02aba2 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 9 Sep 2004 10:35:11 +0000 Subject: INTEGRATION: CWS ooo20040815 (1.15.62); FILE MERGED 2004/08/04 12:56:44 waratah 1.15.62.1: #i32569# add an initialisation to one variable remove unused variable from code --- goodies/source/graphic/grfcache.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'goodies') diff --git a/goodies/source/graphic/grfcache.cxx b/goodies/source/graphic/grfcache.cxx index f96337528dab..99cb739233cb 100644 --- a/goodies/source/graphic/grfcache.cxx +++ b/goodies/source/graphic/grfcache.cxx @@ -2,9 +2,9 @@ * * $RCSfile: grfcache.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2004-01-06 15:07:33 $ + * last change: $Author: hr $ $Date: 2004-09-09 11:35:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -574,10 +574,10 @@ void GraphicDisplayCacheEntry::Draw( OutputDevice* pOut, const Point& rPt, const GraphicCache::GraphicCache( GraphicManager& rMgr, ULONG nDisplayCacheSize, ULONG nMaxObjDisplayCacheSize ) : mrMgr ( rMgr ), + mnReleaseTimeoutSeconds ( 0UL ), mnMaxDisplaySize ( nDisplayCacheSize ), mnMaxObjDisplaySize ( nMaxObjDisplayCacheSize ), - mnUsedDisplaySize ( 0UL ), - mnReleaseTimeoutSeconds ( 0UL ) + mnUsedDisplaySize ( 0UL ) { maReleaseTimer.SetTimeoutHdl( LINK( this, GraphicCache, ReleaseTimeoutHdl ) ); maReleaseTimer.SetTimeout( RELEASE_TIMEOUT ); @@ -814,7 +814,7 @@ BOOL GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const const Point aPtPixel( pOut->LogicToPixel( rPt ) ); const Size aSzPixel( pOut->LogicToPixel( rSz ) ); const GraphicCacheEntry* pCacheEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj ); - GraphicDisplayCacheEntry* pDisplayEntry = (GraphicDisplayCacheEntry*) ( (GraphicCache*) this )->maDisplayCache.First(); + //GraphicDisplayCacheEntry* pDisplayEntry = (GraphicDisplayCacheEntry*) ( (GraphicCache*) this )->maDisplayCache.First(); // -Wall removed .... BOOL bFound = FALSE; for( long i = 0, nCount = maDisplayCache.Count(); !bFound && ( i < nCount ); i++ ) -- cgit