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

[Chris Sherlock]

 vcl/inc/generic/glyphcache.hxx |   68 ++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 30 deletions(-)

New commits:
commit 85819f2374d94b891ba6702ac9dfbdc3b6db9795
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Jan 11 13:46:20 2015 +1100

    vcl: cosmetic reident and cleanup of RawBitmap class definition
    
    Change-Id: I747199b0cf7079bcebef396865942876f592da8d

diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 5930f17..6526cfb 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -337,22 +337,23 @@ protected:
 class VCL_DLLPUBLIC RawBitmap
 {
 public:
-                    RawBitmap();
-                    ~RawBitmap();
-    bool            Rotate( int nAngle );
+                            RawBitmap();
+                            ~RawBitmap();
+
+    bool                    Rotate( int nAngle );
 
 public:
     basebmp::RawMemorySharedArray mpBits;
-    sal_uLong           mnAllocated;
+    sal_uLong               mnAllocated;
 
-    sal_uLong           mnWidth;
-    sal_uLong           mnHeight;
+    sal_uLong               mnWidth;
+    sal_uLong               mnHeight;
 
-    sal_uLong           mnScanlineSize;
-    sal_uLong           mnBitCount;
+    sal_uLong               mnScanlineSize;
+    sal_uLong               mnBitCount;
 
-    int             mnXOffset;
-    int             mnYOffset;
+    int                     mnXOffset;
+    int                     mnYOffset;
 };
 
 #endif // INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
commit 9298c07733838cb0651a003b1af805044cb01e1d
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Jan 11 13:43:13 2015 +1100

    vcl: cosmetic reident of GlyphCachePeer class definition
    
    Change-Id: If8b3e4dc04ff0ecdc358b91784c1f2b60c159498

diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index c2e51e9..5930f17 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -322,16 +322,16 @@ public:
 class GlyphCachePeer
 {
 protected:
-                    GlyphCachePeer() : mnBytesUsed(0) {}
-    virtual         ~GlyphCachePeer() {}
+                            GlyphCachePeer() : mnBytesUsed(0) {}
+    virtual                 ~GlyphCachePeer() {}
 
 public:
-    sal_Int32       GetByteCount() const { return mnBytesUsed; }
-    virtual void    RemovingFont( ServerFont& ) {}
-    virtual void    RemovingGlyph( GlyphData& ) {}
+    sal_Int32               GetByteCount() const { return mnBytesUsed; }
+    virtual void            RemovingFont( ServerFont& ) {}
+    virtual void            RemovingGlyph( GlyphData& ) {}
 
 protected:
-    sal_Int32       mnBytesUsed;
+    sal_Int32               mnBytesUsed;
 };
 
 class VCL_DLLPUBLIC RawBitmap
commit 75ec65898a6aad4d003c125fb3e4168695344621
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Jan 11 13:38:54 2015 +1100

    vcl: cosmetic reident and cleanup of ServerFontLayoutEngine class definition
    
    Change-Id: I9ba9044ef9603ec9050b40d3dd6f01cfb45df134

diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index e7da25c..c2e51e9 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -314,8 +314,9 @@ private:
 class ServerFontLayoutEngine
 {
 public:
-    virtual         ~ServerFontLayoutEngine() {}
-    virtual bool    layout(ServerFontLayout&, ImplLayoutArgs&) = 0;
+    virtual                 ~ServerFontLayoutEngine() {}
+
+    virtual bool            layout(ServerFontLayout&, ImplLayoutArgs&) = 0;
 };
 
 class GlyphCachePeer
commit 67deb9f8079a578cf767a6e29a5bbe6eb0b4ecfe
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Jan 11 13:21:24 2015 +1100

    vcl: reident ServerFontLayout class definition
    
    Change-Id: I02c84b1cb6e38e93e268bb388aecca1594917400

diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 82702dd..e7da25c 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -49,6 +49,7 @@ class RawBitmap;
 class ServerFont;
 class ServerFontLayout;
 class ServerFontLayoutEngine;
+
 namespace basegfx { class B2DPolyPolygon; }
 namespace vcl { struct FontCapabilities; }
 
@@ -286,23 +287,28 @@ private:
 
 class VCL_DLLPUBLIC ServerFontLayout : public GenericSalLayout
 {
+public:
+                            ServerFontLayout( ServerFont& );
+
+    virtual bool            LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;
+    virtual void            AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
+    virtual void            DrawText( SalGraphics& ) const SAL_OVERRIDE;
+
+    void                    setNeedFallback(
+                                ImplLayoutArgs& rArgs,
+                                sal_Int32 nIndex,
+                                bool bRightToLeft);
+
+    ServerFont&             GetServerFont() const   { return mrServerFont; }
+
 private:
-    ServerFont&     mrServerFont;
+    ServerFont&             mrServerFont;
     com::sun::star::uno::Reference<com::sun::star::i18n::XBreakIterator> mxBreak;
 
     // enforce proper copy semantic
-    SAL_DLLPRIVATE  ServerFontLayout( const ServerFontLayout& );
-    SAL_DLLPRIVATE  ServerFontLayout& operator=( const ServerFontLayout& );
+    SAL_DLLPRIVATE          ServerFontLayout( const ServerFontLayout& );
+    SAL_DLLPRIVATE          ServerFontLayout& operator=( const ServerFontLayout& );
 
-public:
-                    ServerFontLayout( ServerFont& );
-    virtual bool    LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;
-    virtual void    AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
-    virtual void    DrawText( SalGraphics& ) const SAL_OVERRIDE;
-    void            setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nIndex,
-                        bool bRightToLeft);
-
-    ServerFont&     GetServerFont() const   { return mrServerFont; }
 };
 
 class ServerFontLayoutEngine