summaryrefslogtreecommitdiff
path: root/vcl/generic/glyphs/glyphcache.cxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-02 16:45:44 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-02 16:54:18 +0300
commit50bf123ddbeb457b89636621a99c971834adf3ab (patch)
treeb7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/generic/glyphs/glyphcache.cxx
parentdb1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff)
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/generic/glyphs/glyphcache.cxx')
-rw-r--r--vcl/generic/glyphs/glyphcache.cxx21
1 files changed, 0 insertions, 21 deletions
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 7c7e2d15d8fc..2509c00bdb54 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -51,14 +50,12 @@ GlyphCache::GlyphCache( GlyphCachePeer& rPeer )
mpFtManager = new FreetypeManager;
}
-
GlyphCache::~GlyphCache()
{
InvalidateAllGlyphs();
delete mpFtManager;
}
-
void GlyphCache::InvalidateAllGlyphs()
{
for( FontList::iterator it = maFontList.begin(), end = maFontList.end(); it != end; ++it )
@@ -72,7 +69,6 @@ void GlyphCache::InvalidateAllGlyphs()
mpCurrentGCFont = NULL;
}
-
inline
size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData ) const
{
@@ -98,7 +94,6 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData
return nHash;
}
-
bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const FontSelectPattern& rB) const
{
// check font ids
@@ -146,13 +141,11 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font
return true;
}
-
GlyphCache& GlyphCache::GetInstance()
{
return *pInstance;
}
-
void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum,
sal_IntPtr nFontId, const ImplDevFontAttributes& rDFA)
{
@@ -160,7 +153,6 @@ void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum,
mpFtManager->AddFontFile( rNormalizedName, nFaceNum, nFontId, rDFA);
}
-
void GlyphCache::AnnounceFonts( PhysicalFontCollection* pFontCollection ) const
{
if( mpFtManager )
@@ -174,7 +166,6 @@ void GlyphCache::ClearFontCache()
mpFtManager->ClearFontList();
}
-
ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData )
{
// a serverfont request has pFontData
@@ -226,7 +217,6 @@ ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData )
return pNew;
}
-
void GlyphCache::UncacheFont( ServerFont& rServerFont )
{
// the interface for rServerFont must be const because a
@@ -241,7 +231,6 @@ void GlyphCache::UncacheFont( ServerFont& rServerFont )
}
}
-
void GlyphCache::GarbageCollect()
{
// when current GC font has been destroyed get another one
@@ -292,13 +281,11 @@ void GlyphCache::GarbageCollect()
}
}
-
inline void GlyphCache::UsingGlyph( ServerFont&, GlyphData& rGlyphData )
{
rGlyphData.SetLruValue( mnLruIndex++ );
}
-
inline void GlyphCache::AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphData )
{
++mnGlyphCount;
@@ -307,14 +294,12 @@ inline void GlyphCache::AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphDa
GrowNotify();
}
-
void GlyphCache::GrowNotify()
{
if( (mnBytesUsed + mrPeer.GetByteCount()) > mnMaxSize )
GarbageCollect();
}
-
inline void GlyphCache::RemovingGlyph( GlyphData& rGD )
{
mrPeer.RemovingGlyph( rGD );
@@ -322,7 +307,6 @@ inline void GlyphCache::RemovingGlyph( GlyphData& rGD )
--mnGlyphCount;
}
-
void ServerFont::ReleaseFromGarbageCollect()
{
// remove from GC list
@@ -334,14 +318,12 @@ void ServerFont::ReleaseFromGarbageCollect()
mpNextGCFont = NULL;
}
-
long ServerFont::Release() const
{
DBG_ASSERT( mnRefCount > 0, "ServerFont: RefCount underflow" );
return --mnRefCount;
}
-
GlyphData& ServerFont::GetGlyphData( sal_GlyphId aGlyphId )
{
// usually the GlyphData is cached
@@ -360,7 +342,6 @@ GlyphData& ServerFont::GetGlyphData( sal_GlyphId aGlyphId )
return rGlyphData;
}
-
void ServerFont::GarbageCollect( long nMinLruIndex )
{
GlyphList::iterator it = maGlyphList.begin();
@@ -379,14 +360,12 @@ void ServerFont::GarbageCollect( long nMinLruIndex )
}
}
-
ImplServerFontEntry::ImplServerFontEntry( FontSelectPattern& rFSD )
: ImplFontEntry( rFSD )
, mpServerFont( NULL )
, mbGotFontOptions( false )
{}
-
void ImplServerFontEntry::SetServerFont(ServerFont* p)
{
if (p == mpServerFont)