vcl: take into account the font width is the average font width

I'm changing the Font class function names:

- SetSize       -> SetFontSize
- GetSize       -> GetFontSize
- SetHeight     -> SetFontHeight
- GetHeight     -> GetFontHeight
- SetWidth      -> SetAverageFontWidth
- GetWidth      -> GetAverageFontWidth

That's because it really makes no sense to say that there is a
single constant font width because obviously proportional fonts
don't have one - the best we can do is an average font width,
which is what folks like Microsoft sort of do already. On a fixed
font, the average is still accurate, for obvious reasons :-)

I'm also not a fan of GetSize/SetSize as I find it a might too
generic.

Change-Id: Ib80a604ba62d6883fd6cbc7994da763976be5c70
Reviewed-on: https://gerrit.libreoffice.org/22069
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index e30bfe4befdf..b566ea47bdcf 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -47,6 +47,7 @@ public:
     FontWidth           GetWidthType()                                  { if(meWidthType==WIDTH_DONTKNOW) AskConfig(); return meWidthType; }
     TextAlign           GetAlignment() const                            { return meAlign; }
     rtl_TextEncoding    GetCharSet() const                              { return meCharSet; }
+    const Size&         GetFontSize() const                      { return maAverageFontSize; }
 
     bool                IsSymbolFont() const                            { return mbSymbolFlag; }
 
@@ -60,6 +61,7 @@ public:
     void                SetWidthType( const FontWidth eWidthType )      { meWidthType = eWidthType; }
     void                SetAlignment( const TextAlign eAlignment )      { meAlign = eAlignment; }
     void                SetCharSet( const rtl_TextEncoding eCharSet )   { meCharSet = eCharSet; }
+    void                SetFontSize( const Size& rSize )         { maAverageFontSize = rSize; }
 
     void                SetSymbolFlag( const bool bSymbolFlag )         { mbSymbolFlag = bSymbolFlag; }
 
@@ -91,11 +93,6 @@ public:
     void                SetSubsettableFlag( bool bSubsettable )         { mbSubsettable = bSubsettable; }
     void                SetOrientationFlag( bool bCanRotate )           { mbRotatable = bCanRotate; }
 
-    // Metric data
-    const Size&         GetFontSize() const                             { return maSize; }
-
-    void                SetFontSize( const Size& rSize )                { maSize = rSize; }
-
     bool                operator==( const ImplFont& ) const;
 
 private:
@@ -122,7 +119,7 @@ private:
     FontRelief          meRelief;
     FontEmphasisMark    meEmphasisMark;
     FontKerning         meKerning;
-    Size                maSize;
+    Size                maAverageFontSize;
     rtl_TextEncoding    meCharSet;
 
     LanguageTag         maLanguageTag;