vcl/inc/impfontmetric.hxx | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
New commits:
commit 6418f58bd3550b397127f7f8f4a708276593b5a9
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Fri Jan 15 06:22:44 2016 +1100
vcl: reorganize ImplFontMetric to same layout as ImplFontMetricData
Change-Id: I40b850c7150327b0b7a8b1f081d237e6f5be3f51
diff --git a/vcl/inc/impfontmetric.hxx b/vcl/inc/impfontmetric.hxx
index 7b9413f..e39a8bb 100644
--- a/vcl/inc/impfontmetric.hxx
+++ b/vcl/inc/impfontmetric.hxx
@@ -31,25 +31,8 @@ class ImplFontMetric
friend void intrusive_ptr_add_ref(ImplFontMetric* pImplFontMetric);
friend void intrusive_ptr_release(ImplFontMetric* pImplFontMetric);
-private:
- long mnAscent; // Ascent
- long mnDescent; // Descent
- long mnIntLeading; // Internal Leading
- long mnExtLeading; // External Leading
- long mnLineHeight; // Ascent+Descent+EmphasisMark
- long mnSlant; // Slant
- long mnBulletOffset;// Offset for non-printing character
- sal_uInt32 mnRefCount; // Reference Counter
-
- bool mbScalableFont;
- bool mbFullstopCentered;
- bool mbDevice;
-
public:
-
- bool operator==( const ImplFontMetric& ) const;
-
- ImplFontMetric();
+ explicit ImplFontMetric();
long GetAscent() const { return
mnAscent; }
long GetDescent() const { return
mnDescent; }
@@ -75,6 +58,22 @@ public:
void SetFullstopCenteredFlag( bool bCentered ) {
mbFullstopCentered = bCentered; }
void SetBuiltInFontFlag( bool bIsBuiltInFont ) { mbDevice
= bIsBuiltInFont; }
+ bool operator==( const ImplFontMetric& ) const;
+
+private:
+ long mnAscent; // Ascent
+ long mnDescent; // Descent
+ long mnIntLeading; // Internal Leading
+ long mnExtLeading; // External Leading
+ long mnLineHeight; //
Ascent+Descent+EmphasisMark
+ long mnSlant; // Slant
+ long mnBulletOffset; // Offset for
non-printing character
+ sal_uInt32 mnRefCount; // Reference Counter
+
+ bool mbScalableFont;
+ bool mbFullstopCentered;
+ bool mbDevice;
+
};
inline void intrusive_ptr_add_ref(ImplFontMetric* pImplFontMetric)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
