summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2015-01-11 12:52:20 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2015-01-11 12:52:20 +1100
commit2343e796e9f787e57c9dfb0d56f21bf7dbec562b (patch)
tree2cf3c734f07f3d9ed9c9dce3e32918b682923908 /vcl/inc
parent765eb71eae6d6550eaec6aa998cb0a2a615bb590 (diff)
vcl: more whitespace cleanup of GlyphCache class definition
Change-Id: I7a097c849eaa49eab688660cb229222cdf658b81
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/generic/glyphcache.hxx52
1 files changed, 27 insertions, 25 deletions
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 67c268b28654..fa7ff865741d 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -55,34 +55,36 @@ namespace vcl { struct FontCapabilities; }
class VCL_DLLPUBLIC GlyphCache
{
public:
- explicit GlyphCache( GlyphCachePeer& );
- ~GlyphCache();
+ explicit GlyphCache( GlyphCachePeer& );
+ ~GlyphCache();
- static GlyphCache& GetInstance();
+ static GlyphCache& GetInstance();
- void AddFontFile( const OString& rNormalizedName,
- int nFaceNum, sal_IntPtr nFontId,
- const ImplDevFontAttributes&);
- void AnnounceFonts( PhysicalFontCollection* ) const;
+ void AddFontFile(
+ const OString& rNormalizedName,
+ int nFaceNum, sal_IntPtr nFontId,
+ const ImplDevFontAttributes&);
- ServerFont* CacheFont( const FontSelectPattern& );
- void UncacheFont( ServerFont& );
- void ClearFontCache();
- void InvalidateAllGlyphs();
+ void AnnounceFonts( PhysicalFontCollection* ) const;
+
+ ServerFont* CacheFont( const FontSelectPattern& );
+ void UncacheFont( ServerFont& );
+ void ClearFontCache();
+ void InvalidateAllGlyphs();
protected:
- GlyphCachePeer& mrPeer;
+ GlyphCachePeer& mrPeer;
private:
friend class ServerFont;
// used by ServerFont class only
- void AddedGlyph( ServerFont&, GlyphData& );
- void RemovingGlyph( GlyphData& );
- void UsingGlyph( ServerFont&, GlyphData& );
- void GrowNotify();
+ void AddedGlyph( ServerFont&, GlyphData& );
+ void RemovingGlyph( GlyphData& );
+ void UsingGlyph( ServerFont&, GlyphData& );
+ void GrowNotify();
private:
- void GarbageCollect();
+ void GarbageCollect();
// the GlyphCache's FontList matches a font request to a serverfont instance
// the FontList key's mpFontData member is reinterpreted as integer font id
@@ -90,20 +92,20 @@ private:
struct IFSD_Hash{ size_t operator()( const FontSelectPattern& ) const; };
typedef std::unordered_map<FontSelectPattern,ServerFont*,IFSD_Hash,IFSD_Equal > FontList;
- FontList maFontList;
- sal_uLong mnMaxSize; // max overall cache size in bytes
- mutable sal_uLong mnBytesUsed;
- mutable long mnLruIndex;
- mutable int mnGlyphCount;
- ServerFont* mpCurrentGCFont;
+ FontList maFontList;
+ sal_uLong mnMaxSize; // max overall cache size in bytes
+ mutable sal_uLong mnBytesUsed;
+ mutable long mnLruIndex;
+ mutable int mnGlyphCount;
+ ServerFont* mpCurrentGCFont;
- class FreetypeManager* mpFtManager;
+ class FreetypeManager* mpFtManager;
};
class GlyphMetric
{
public:
- GlyphMetric() : mnAdvanceWidth(0) {}
+ GlyphMetric() : mnAdvanceWidth(0) {}
Point GetOffset() const { return maOffset; }
Point GetDelta() const { return maDelta; }