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

[Chris Sherlock]

 vcl/inc/generic/glyphcache.hxx |   54 +++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

New commits:
commit 2343e796e9f787e57c9dfb0d56f21bf7dbec562b
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Jan 11 12:52:20 2015 +1100

    vcl: more whitespace cleanup of GlyphCache class definition
    
    Change-Id: I7a097c849eaa49eab688660cb229222cdf658b81

diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 67c268b..fa7ff86 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; }
commit 765eb71eae6d6550eaec6aa998cb0a2a615bb590
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Jan 11 12:49:35 2015 +1100

    vcl: whitespace cleanup on GlyphData class definition
    
    Change-Id: Ib5b2a3840e2f3ca1b7e2faf57182a262e06cb74e

diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 0f4070d..67c268b 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -139,7 +139,7 @@ struct ExtGlyphData
 class GlyphData
 {
 public:
-    GlyphData() : mnLruValue(0) {}
+                            GlyphData() : mnLruValue(0) {}
 
     const GlyphMetric&      GetMetric() const           { return maMetric; }
     Size                    GetSize() const             { return maMetric.GetSize(); }