Cleanup after removing vcl::FontInfo class

Change-Id: I544eac439cb7277e47a23a90c6fbc45496161c3b

4 files changed, 22 insertions, 22 deletions

diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 5dfff7a2b6c2..cb5a7bf2033a 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -122,9 +122,9 @@ void SvxFontSizeMenuControl::StateChanged(
 
                     if ( pList )
                     {
-                        FontMetric aFntInf = pList->Get( pItem->GetFamilyName(),
+                        FontMetric aFontMetric = pList->Get( pItem->GetFamilyName(),
                                                        pItem->GetStyleName() );
-                        pMenu->Fill( aFntInf, pList );
+                        pMenu->Fill( aFontMetric, pList );
                     }
                     // else manche Shells haben keine Fontliste (z.B. Image)
                 }
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index dff849cb43c1..1052a825de8a 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1736,8 +1736,8 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
                 }
                 if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
                 {
-                    FontMetric aInfo = pList->Get(pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
-                    vcl::Font aFont(aInfo);
+                    FontMetric aFontMetric = pList->Get(pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
+                    vcl::Font aFont(aFontMetric);
                     aFmt.SetBulletFont(&aFont);
                 }
                 else
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 340bd842d097..7d8daf348c37 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1140,15 +1140,15 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
              fontName = GetEntry(rUDEvt.GetItemId());
         }
         Sequence< PropertyValue > aArgs( 1 );
-        FontMetric aInfo( pFontList->Get( fontName,
+        FontMetric aFontMetric( pFontList->Get( fontName,
             aCurFont.GetWeight(),
             aCurFont.GetItalic() ) );
 
-        SvxFontItem aFontItem( aInfo.GetFamily(),
-            aInfo.GetName(),
-            aInfo.GetStyleName(),
-            aInfo.GetPitch(),
-            aInfo.GetCharSet(),
+        SvxFontItem aFontItem( aFontMetric.GetFamily(),
+            aFontMetric.GetName(),
+            aFontMetric.GetStyleName(),
+            aFontMetric.GetPitch(),
+            aFontMetric.GetCharSet(),
             SID_ATTR_CHAR_FONT );
         aFontItem.QueryValue( aArgs[0].Value );
         aArgs[0].Name   = "CharPreviewFontName";
@@ -1166,16 +1166,16 @@ void SvxFontNameBox_Impl::Select()
     std::unique_ptr<SvxFontItem> pFontItem;
     if ( pFontList )
     {
-        FontMetric aInfo( pFontList->Get( GetText(),
+        FontMetric aFontMetric( pFontList->Get( GetText(),
             aCurFont.GetWeight(),
             aCurFont.GetItalic() ) );
-        aCurFont = aInfo;
+        aCurFont = aFontMetric;
 
-        pFontItem.reset( new SvxFontItem( aInfo.GetFamily(),
-            aInfo.GetName(),
-            aInfo.GetStyleName(),
-            aInfo.GetPitch(),
-            aInfo.GetCharSet(),
+        pFontItem.reset( new SvxFontItem( aFontMetric.GetFamily(),
+            aFontMetric.GetName(),
+            aFontMetric.GetStyleName(),
+            aFontMetric.GetPitch(),
+            aFontMetric.GetCharSet(),
             SID_ATTR_CHAR_FONT ) );
 
         Any a;
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index f749f317c5f3..5e51c2e66291 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -195,11 +195,11 @@ void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& rCurrentFo
 
     if ( !rCurrentFont.Name.isEmpty() )
     {
-        FontMetric _aFontInfo;
-        _aFontInfo.SetName( rCurrentFont.Name );
-        _aFontInfo.SetStyleName( rCurrentFont.StyleName );
-        _aFontInfo.SetHeight( rCurrentFont.Height );
-        Fill( &_aFontInfo, _pFontList );
+        FontMetric _aFontMetric;
+        _aFontMetric.SetName( rCurrentFont.Name );
+        _aFontMetric.SetStyleName( rCurrentFont.StyleName );
+        _aFontMetric.SetHeight( rCurrentFont.Height );
+        Fill( &_aFontMetric, _pFontList );
     }
     else
     {