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/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 8bd7b594b08a..eb324504f1b3 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1089,7 +1089,7 @@ namespace
     {
         long nWidth = 0;
 
-        Size aSize( rFont.GetSize() );
+        Size aSize( rFont.GetFontSize() );
 
         //Make sure it fits in the available height
         while (aSize.Height() > 0)
@@ -1103,7 +1103,7 @@ namespace
             }
 
             aSize.Height() -= EXTRAFONTSIZE;
-            rFont.SetSize(aSize);
+            rFont.SetFontSize(aSize);
             rDevice.SetFont(rFont);
         }
 
@@ -1129,10 +1129,10 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
 
         Color aTextColor = pRenderContext->GetTextColor();
         vcl::Font aOldFont(pRenderContext->GetFont());
-        Size aSize( aOldFont.GetSize() );
+        Size aSize( aOldFont.GetFontSize() );
         aSize.Height() += EXTRAFONTSIZE;
         vcl::Font aFont( rFontMetric );
-        aFont.SetSize( aSize );
+        aFont.SetFontSize( aSize );
         pRenderContext->SetFont(aFont);
         pRenderContext->SetTextColor(aTextColor);