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

Chris Sherlock chris.sherlock79 at gmail.com
Wed Jan 13 16:07:46 PST 2016


 vcl/inc/impfontmetricdata.hxx |  111 ++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 58 deletions(-)

New commits:
commit 5c617bd1c413fb57497076bc3be1c3b3650d0030
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Thu Jan 14 11:07:04 2016 +1100

    vcl: remove unneeded headers from impfontmetricdata.hxx
    
    Change-Id: I0f287bc48582aa26ec4cd69d8175d12cda0e567d

diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx
index 2ccee0d..8f0c0e9 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/impfontmetricdata.hxx
@@ -20,13 +20,8 @@
 #ifndef INCLUDED_VCL_INC_IMPFONTMETRICDATA_HXX
 #define INCLUDED_VCL_INC_IMPFONTMETRICDATA_HXX
 
-#include <sal/types.h>
-#include <i18nlangtag/lang.h>
-#include <unotools/fontdefs.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/vclenum.hxx>
 
-#include "fontselect.hxx"
 #include "fontattributes.hxx"
 
 class OutputDevice;
@@ -38,66 +33,66 @@ public:
     explicit        ImplFontMetricData( const FontSelectPattern& );
 
     // font instance attributes from the font request
-    long            GetWidth()                                  { return mnWidth; }
-    short           GetOrientation()                            { return mnOrientation; }
+    long            GetWidth()                                                      { return mnWidth; }
+    short           GetOrientation()                                                { return mnOrientation; }
 
-    void            SetWidth(long nWidth)                       { mnWidth=nWidth; }
-    void            SetOrientation(short nOrientation)          { mnOrientation=nOrientation; }
+    void            SetWidth(long nWidth)                                           { mnWidth=nWidth; }
+    void            SetOrientation(short nOrientation)                              { mnOrientation=nOrientation; }
 
     // font metrics measured for the font instance
-    long            GetAscent()                                 { return mnAscent; }
-    long            GetDescent()                                { return mnDescent; }
-    long            GetInternalLeading()                        { return mnIntLeading; }
-    long            GetExternalLeading()                        { return mnExtLeading; }
-    int             GetSlant()                                  { return mnSlant; }
-    long            GetMinKashida()                             { return mnMinKashida; }
-
-    void            SetAscent(long nAscent)                     { mnAscent=nAscent; }
-    void            SetDescent(long nDescent)                   { mnDescent=nDescent; }
-    void            SetInternalLeading(long nIntLeading)        { mnIntLeading = nIntLeading; }
-    void            SetExternalLeading(long nExtLeading)        { mnExtLeading = nExtLeading; }
-    void            SetSlant(int nSlant)                        { mnSlant=nSlant; }
-    void            SetMinKashida( long nMinKashida )           { mnMinKashida=nMinKashida; }
+    long            GetAscent()                                                     { return mnAscent; }
+    long            GetDescent()                                                    { return mnDescent; }
+    long            GetInternalLeading()                                            { return mnIntLeading; }
+    long            GetExternalLeading()                                            { return mnExtLeading; }
+    int             GetSlant()                                                      { return mnSlant; }
+    long            GetMinKashida()                                                 { return mnMinKashida; }
+
+    void            SetAscent(long nAscent)                                         { mnAscent=nAscent; }
+    void            SetDescent(long nDescent)                                       { mnDescent=nDescent; }
+    void            SetInternalLeading(long nIntLeading)                            { mnIntLeading = nIntLeading; }
+    void            SetExternalLeading(long nExtLeading)                            { mnExtLeading = nExtLeading; }
+    void            SetSlant(int nSlant)                                            { mnSlant=nSlant; }
+    void            SetMinKashida( long nMinKashida )                               { mnMinKashida=nMinKashida; }
 
     // font attributes queried from the font instance
-    bool            IsScalable()                                { return mbScalableFont; }
-    bool            IsTrueTypeFont()                            { return mbTrueTypeFont; }
-    bool            IsKernable()                                { return mbKernableFont; }
-    bool            IsFullstopCentered()                        { return mbFullstopCentered; }
-    long            GetBulletOffset()                           { return mnBulletOffset; }
-
-    void            SetScalableFlag(bool bScalable)             { mbScalableFont = bScalable; }
-    void            SetTrueTypeFlag(bool bTrueTypeFont)         { mbTrueTypeFont = bTrueTypeFont; }
-    void            SetKernableFlag(bool bKernable)             { mbKernableFont = bKernable; }
-    void            SetFullstopCenteredFlag(bool bFullstopCentered) { mbFullstopCentered = bFullstopCentered; }
-    void            SetBulletOffset(long nBulletOffset)         { mnBulletOffset = nBulletOffset; }
+    bool            IsScalable()                                                    { return mbScalableFont; }
+    bool            IsTrueTypeFont()                                                { return mbTrueTypeFont; }
+    bool            IsKernable()                                                    { return mbKernableFont; }
+    bool            IsFullstopCentered()                                            { return mbFullstopCentered; }
+    long            GetBulletOffset()                                               { return mnBulletOffset; }
+
+    void            SetScalableFlag(bool bScalable)                                 { mbScalableFont = bScalable; }
+    void            SetTrueTypeFlag(bool bTrueTypeFont)                             { mbTrueTypeFont = bTrueTypeFont; }
+    void            SetKernableFlag(bool bKernable)                                 { mbKernableFont = bKernable; }
+    void            SetFullstopCenteredFlag(bool bFullstopCentered)                 { mbFullstopCentered = bFullstopCentered; }
+    void            SetBulletOffset(long nBulletOffset)                             { mnBulletOffset = nBulletOffset; }
 
     // font metrics that are usually derived from the measurements
-    long            GetUnderlineSize()                          { return mnUnderlineSize; }
-    long            GetUnderlineOffset()                        { return mnUnderlineOffset; }
-    long            GetBoldUnderlineSize()                      { return mnBUnderlineSize; }
-    long            GetBoldUnderlineOffset()                    { return mnBUnderlineOffset; }
-    long            GetDoubleUnderlineSize()                    { return mnDUnderlineSize; }
-    long            GetDoubleUnderlineOffset1()                 { return mnDUnderlineOffset1; }
-    long            GetDoubleUnderlineOffset2()                 { return mnDUnderlineOffset2; }
-    long            GetWavelineUnderlineSize()                  { return mnWUnderlineSize; }
-    long            GetWavelineUnderlineOffset()                { return mnWUnderlineOffset; }
-    long            GetAboveUnderlineSize()                     { return mnAboveUnderlineSize; }
-    long            GetAboveUnderlineOffset()                   { return mnAboveUnderlineOffset; }
-    long            GetAboveBoldUnderlineSize()                 { return mnAboveBUnderlineSize; }
-    long            GetAboveBoldUnderlineOffset()               { return mnAboveBUnderlineOffset; }
-    long            GetAboveDoubleUnderlineSize()               { return mnAboveDUnderlineSize; }
-    long            GetAboveDoubleUnderlineOffset1()            { return mnAboveDUnderlineOffset1; }
-    long            GetAboveDoubleUnderlineOffset2()            { return mnAboveDUnderlineOffset2; }
-    long            GetAboveWavelineUnderlineSize()             { return mnAboveWUnderlineSize; }
-    long            GetAboveWavelineUnderlineOffset()           { return mnAboveWUnderlineOffset; }
-    long            GetStrikeoutSize()                          { return mnStrikeoutSize; }
-    long            GetStrikeoutOffset()                        { return mnStrikeoutOffset; }
-    long            GetBoldStrikeoutSize()                      { return mnBStrikeoutSize; }
-    long            GetBoldStrikeoutOffset()                    { return mnBStrikeoutOffset; }
-    long            GetDoubleStrikeoutSize()                    { return mnDStrikeoutSize; }
-    long            GetDoubleStrikeoutOffset1()                 { return mnDStrikeoutOffset1; }
-    long            GetDoubleStrikeoutOffset2()                 { return mnDStrikeoutOffset2; }
+    long            GetUnderlineSize()                                              { return mnUnderlineSize; }
+    long            GetUnderlineOffset()                                            { return mnUnderlineOffset; }
+    long            GetBoldUnderlineSize()                                          { return mnBUnderlineSize; }
+    long            GetBoldUnderlineOffset()                                        { return mnBUnderlineOffset; }
+    long            GetDoubleUnderlineSize()                                        { return mnDUnderlineSize; }
+    long            GetDoubleUnderlineOffset1()                                     { return mnDUnderlineOffset1; }
+    long            GetDoubleUnderlineOffset2()                                     { return mnDUnderlineOffset2; }
+    long            GetWavelineUnderlineSize()                                      { return mnWUnderlineSize; }
+    long            GetWavelineUnderlineOffset()                                    { return mnWUnderlineOffset; }
+    long            GetAboveUnderlineSize()                                         { return mnAboveUnderlineSize; }
+    long            GetAboveUnderlineOffset()                                       { return mnAboveUnderlineOffset; }
+    long            GetAboveBoldUnderlineSize()                                     { return mnAboveBUnderlineSize; }
+    long            GetAboveBoldUnderlineOffset()                                   { return mnAboveBUnderlineOffset; }
+    long            GetAboveDoubleUnderlineSize()                                   { return mnAboveDUnderlineSize; }
+    long            GetAboveDoubleUnderlineOffset1()                                { return mnAboveDUnderlineOffset1; }
+    long            GetAboveDoubleUnderlineOffset2()                                { return mnAboveDUnderlineOffset2; }
+    long            GetAboveWavelineUnderlineSize()                                 { return mnAboveWUnderlineSize; }
+    long            GetAboveWavelineUnderlineOffset()                               { return mnAboveWUnderlineOffset; }
+    long            GetStrikeoutSize()                                              { return mnStrikeoutSize; }
+    long            GetStrikeoutOffset()                                            { return mnStrikeoutOffset; }
+    long            GetBoldStrikeoutSize()                                          { return mnBStrikeoutSize; }
+    long            GetBoldStrikeoutOffset()                                        { return mnBStrikeoutOffset; }
+    long            GetDoubleStrikeoutSize()                                        { return mnDStrikeoutSize; }
+    long            GetDoubleStrikeoutOffset1()                                     { return mnDStrikeoutOffset1; }
+    long            GetDoubleStrikeoutOffset2()                                     { return mnDStrikeoutOffset2; }
 
     void            SetUnderlineSize( long nUnderlineSize )                         { mnUnderlineSize = nUnderlineSize; }
     void            SetUnderlineOffset( long nUnderlineOffset )                     { mnUnderlineOffset = nUnderlineOffset; }


More information about the Libreoffice-commits mailing list