5 files changed, 14 insertions, 14 deletions
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 13c14468a50a..84b217d1d095 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -301,10 +301,10 @@ DayOfWeek Calendar::ImplGetWeekStart() const
 void Calendar::ImplGetWeekFont( vcl::Font& rFont ) const
 {
     // weeknumber is displayed in WEEKNUMBER_HEIGHT%-Fontheight
-    Size aFontSize = rFont.GetSize();
+    Size aFontSize = rFont.GetFontSize();
     aFontSize.Height() *= WEEKNUMBER_HEIGHT;
     aFontSize.Height() /= 100;
-    rFont.SetSize( aFontSize );
+    rFont.SetFontSize( aFontSize );
     rFont.SetWeight( WEIGHT_NORMAL );
 }
 
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);
 
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 62c6172c60ff..d5442971c73f 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -134,7 +134,7 @@ void FileControl::StateChanged( StateChangedType nType )
         // Only use height of the button, as in HTML
         // always Courier is used
         vcl::Font aFont = GetButton().GetControlFont();
-        aFont.SetSize( GetControlFont().GetSize() );
+        aFont.SetFontSize( GetControlFont().GetFontSize() );
         GetButton().SetControlFont( aFont );
     }
     else if ( nType == StateChangedType::ControlForeground )
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 1a2d257caf58..7491da7f4427 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -1052,8 +1052,8 @@ void Ruler::ApplySettings(vcl::RenderContext& rRenderContext)
 
     vcl::Font aFont = rStyleSettings.GetToolFont();
     // make the font a bit smaller than default
-    Size aSize(adjustSize(aFont.GetSize().Width()), adjustSize(aFont.GetSize().Height()));
-    aFont.SetSize(aSize);
+    Size aSize(adjustSize(aFont.GetFontSize().Width()), adjustSize(aFont.GetFontSize().Height()));
+    aFont.SetFontSize(aSize);
 
     ApplyControlFont(rRenderContext, aFont);
 
@@ -1074,8 +1074,8 @@ void Ruler::ImplInitSettings(bool bFont, bool bForeground, bool bBackground)
     {
         vcl::Font aFont = rStyleSettings.GetToolFont();
         // make the font a bit smaller than default
-        Size aSize(adjustSize(aFont.GetSize().Width()), adjustSize(aFont.GetSize().Height()));
-        aFont.SetSize(aSize);
+        Size aSize(adjustSize(aFont.GetFontSize().Width()), adjustSize(aFont.GetFontSize().Height()));
+        aFont.SetFontSize(aSize);
 
         ApplyControlFont(*this, aFont);
     }
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 307987955451..2fa74ceddc7e 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -638,9 +638,9 @@ void TabBar::ImplInitSettings( bool bFont, bool bBackground )
         while (GetTextHeight() > (GetOutputSizePixel().Height() - 1))
         {
             vcl::Font aFont = GetFont();
-            if (aFont.GetHeight() <= 6)
+            if (aFont.GetFontHeight() <= 6)
                 break;
-            aFont.SetHeight(aFont.GetHeight() - 1);
+            aFont.SetFontHeight(aFont.GetFontHeight() - 1);
             SetFont(aFont);
         }
     }
@@ -723,7 +723,7 @@ bool TabBar::ImplCalcWidth()
         }
 
         // Padding is dependent on font height - bigger font = bigger padding
-        long nFontWidth = aFont.GetHeight();
+        long nFontWidth = aFont.GetFontHeight();
         nNewWidth += nFontWidth * 2;
 
         if (pItem->mnWidth != nNewWidth)