diff options
| author | Noel Grandin <noel@peralex.com> | 2015-12-24 09:21:23 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-24 20:57:35 +0000 |
| commit | 33fac4828038bc38ab4a0c4b891d762a5ae73e5e (patch) | |
| tree | a5e9404df7ae0f662ef5d7272134596ce63afa71 /vcl/generic | |
| parent | d3e57ccf2e56a75bd4f004de53793f1742e34bc4 (diff) | |
loplugin:unnecessaryvirtual
and unwind some apparently now unused VCL OpenGL and GlyphCachePeer
stuff.
Change-Id: Ic85302d4e1ad4056dabc49c97a608891052e3167
Reviewed-on: https://gerrit.libreoffice.org/20920
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/glyphs/glyphcache.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 79c827966cc7..8a2c955ae8d4 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -36,9 +36,8 @@ static GlyphCache* pInstance = nullptr; -GlyphCache::GlyphCache( GlyphCachePeer& rPeer ) -: mrPeer( rPeer ), - mnMaxSize( 1500000 ), +GlyphCache::GlyphCache() +: mnMaxSize( 1500000 ), mnBytesUsed(sizeof(GlyphCache)), mnLruIndex(0), mnGlyphCount(0), @@ -62,7 +61,6 @@ void GlyphCache::InvalidateAllGlyphs() ServerFont* pServerFont = it->second; // free all pServerFont related data pServerFont->GarbageCollect( mnLruIndex+0x10000000 ); - mrPeer.RemovingFont(*pServerFont); delete pServerFont; } @@ -262,7 +260,6 @@ void GlyphCache::GarbageCollect() mpCurrentGCFont = nullptr; const FontSelectPattern& rIFSD = pServerFont->GetFontSelData(); maFontList.erase( rIFSD ); - mrPeer.RemovingFont( *pServerFont ); mnBytesUsed -= pServerFont->GetByteCount(); // remove font from list of garbage collected fonts @@ -296,9 +293,8 @@ void GlyphCache::GrowNotify() GarbageCollect(); } -inline void GlyphCache::RemovingGlyph( GlyphData& rGD ) +inline void GlyphCache::RemovingGlyph() { - mrPeer.RemovingGlyph( rGD ); mnBytesUsed -= sizeof( GlyphData ); --mnGlyphCount; } @@ -348,7 +344,7 @@ void ServerFont::GarbageCollect( long nMinLruIndex ) { OSL_ASSERT( mnBytesUsed >= sizeof(GlyphData) ); mnBytesUsed -= sizeof( GlyphData ); - GlyphCache::GetInstance().RemovingGlyph( rGD ); + GlyphCache::GetInstance().RemovingGlyph(); it = maGlyphList.erase( it ); } else |