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, 4 insertions, 4 deletions

diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index e5e0696e4c3e..c77af27c1e5b 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -135,7 +135,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat,
     const FontMetric  aFM (rDev.GetFontMetric());
     bool              bIsMath  = aFM.GetFamilyName().equalsIgnoreAsciiCase( FONTNAME_MATH );
     bool              bAllowSmaller = bIsMath && !SmIsMathAlpha(rText);
-    const long        nFontHeight = rDev.GetFont().GetSize().Height();
+    const long        nFontHeight = rDev.GetFont().GetFontSize().Height();
 
     nBorderWidth  = nBorder;
     bHasAlignInfo = true;
@@ -185,7 +185,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat,
 
     long  nDist = 0;
     if (pFormat)
-        nDist = (rDev.GetFont().GetSize().Height()
+        nDist = (rDev.GetFont().GetFontSize().Height()
                 * pFormat->GetDistance(DIS_ORNAMENTSIZE)) / 100L;
 
     nHiAttrFence = aGlyphRect.TopLeft().Y() - 1 - nBorderWidth - nDist;
@@ -620,14 +620,14 @@ bool SmGetGlyphBoundRect(const vcl::RenderContext &rDev,
     // use scale factor when calling GetTextBoundRect to counter
     // negative effects from antialiasing which may otherwise result
     // in significant incorrect bounding rectangles for some characters.
-    Size aFntSize = aFnt.GetSize();
+    Size aFntSize = aFnt.GetFontSize();
 
     // Workaround to avoid HUGE font sizes and resulting problems
     long nScaleFactor = 1;
     while( aFntSize.Height() > 2000 * nScaleFactor )
         nScaleFactor *= 2;
 
-    aFnt.SetSize( Size( aFntSize.Width() / nScaleFactor, aFntSize.Height() / nScaleFactor ) );
+    aFnt.SetFontSize( Size( aFntSize.Width() / nScaleFactor, aFntSize.Height() / nScaleFactor ) );
     pGlyphDev->SetFont(aFnt);
 
     long nTextWidth = rDev.GetTextWidth(rText);