[Libreoffice-commits] core.git: vcl/generic vcl/inc

[Stephan Bergmann]

 vcl/generic/glyphs/glyphcache.cxx |    5 ++---
 vcl/inc/generic/glyphcache.hxx    |    6 +-----
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 6143a7eeabea394133c54e97e3690bdf40b98247
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 3 17:08:01 2015 +0100

    GlyphCachePeer::mnBytesUsed is always zero
    
    ...at least since 1c064d1460fbf84a2fc6c2cdc7824937735a4312 "I don't see that any
    of this makes sense anymore" removed the last uses of it from
    X11GlyphPeer::RemovingGlyph.
    
    Change-Id: Ic8c879ac6023a1e796da220dd61dc33750aaad60

diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 2509c00..cf75255 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -223,8 +223,7 @@ void GlyphCache::UncacheFont( ServerFont& rServerFont )
     // user who wants to release it only got const ServerFonts.
     // The caching algorithm needs a non-const object
     ServerFont* pFont = const_cast<ServerFont*>( &rServerFont );
-    if( (pFont->Release() <= 0)
-    &&  (mnMaxSize <= (mnBytesUsed + mrPeer.GetByteCount())) )
+    if( (pFont->Release() <= 0) && (mnMaxSize <= mnBytesUsed) )
     {
         mpCurrentGCFont = pFont;
         GarbageCollect();
@@ -296,7 +295,7 @@ inline void GlyphCache::AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphDa
 
 void GlyphCache::GrowNotify()
 {
-    if( (mnBytesUsed + mrPeer.GetByteCount()) > mnMaxSize )
+    if( mnBytesUsed > mnMaxSize )
         GarbageCollect();
 }
 
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index a47b25f..b5e8d75 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -322,16 +322,12 @@ public:
 class GlyphCachePeer
 {
 protected:
-                            GlyphCachePeer() : mnBytesUsed(0) {}
+                            GlyphCachePeer() {}
     virtual                 ~GlyphCachePeer() {}
 
 public:
-    sal_Int32               GetByteCount() const { return mnBytesUsed; }
     virtual void            RemovingFont( ServerFont& ) {}
     virtual void            RemovingGlyph( GlyphData& ) {}
-
-protected:
-    sal_Int32               mnBytesUsed;
 };
 
 class VCL_DLLPUBLIC RawBitmap