Cleanup after removing vcl::FontInfo class

Change-Id: I544eac439cb7277e47a23a90c6fbc45496161c3b

8 files changed, 47 insertions, 47 deletions

diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 1bcb2fa61a6f..41904cebfdbb 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -824,9 +824,9 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
                                                     ->GetItem( SID_ATTR_CHAR_FONTLIST ));
                         const FontList*  pList = pFontListItem->GetFontList();
 
-                        FontMetric aInfo = pList->Get(
+                        FontMetric aFontMetric = pList->Get(
                             pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE);
-                        vcl::Font aFont(aInfo);
+                        vcl::Font aFont(aFontMetric);
                         aFormat.SetBulletFont(&aFont);
                     }
                     aRule.Set( i, aFormat );
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 7f51bbc4ac00..39589aad681e 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -828,29 +828,29 @@ void SwXLineNumberingProperties::setPropertyValue(
         {
             if ( pEntry->nFlags & PropertyAttribute::READONLY)
                 throw PropertyVetoException("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
-            SwLineNumberInfo  aInfo(pDoc->GetLineNumberInfo());
+            SwLineNumberInfo  aFontMetric(pDoc->GetLineNumberInfo());
             switch(pEntry->nWID)
             {
                 case WID_NUM_ON:
                 {
                     bool bVal = *static_cast<sal_Bool const *>(aValue.getValue());
-                    aInfo.SetPaintLineNumbers(bVal);
+                    aFontMetric.SetPaintLineNumbers(bVal);
                 }
                 break;
                 case WID_CHARACTER_STYLE :
                 {
                     SwCharFormat* pFormat = lcl_getCharFormat(pDoc, aValue);
                     if(pFormat)
-                        aInfo.SetCharFormat(pFormat);
+                        aFontMetric.SetCharFormat(pFormat);
                 }
                 break;
                 case WID_NUMBERING_TYPE  :
                 {
-                    SvxNumberType aNumType(aInfo.GetNumType());
+                    SvxNumberType aNumType(aFontMetric.GetNumType());
                     sal_Int16 nTmp = 0;
                     aValue >>= nTmp;
                     aNumType.SetNumberingType(nTmp);
-                    aInfo.SetNumType(aNumType);
+                    aFontMetric.SetNumType(aNumType);
                 }
                 break;
                 case WID_NUMBER_POSITION :
@@ -860,16 +860,16 @@ void SwXLineNumberingProperties::setPropertyValue(
                     switch(nTmp)
                     {
                         case  style::LineNumberPosition::LEFT:
-                             aInfo.SetPos(LINENUMBER_POS_LEFT); ;
+                             aFontMetric.SetPos(LINENUMBER_POS_LEFT); ;
                         break;
                         case style::LineNumberPosition::RIGHT :
-                             aInfo.SetPos(LINENUMBER_POS_RIGHT);       ;
+                             aFontMetric.SetPos(LINENUMBER_POS_RIGHT);       ;
                         break;
                         case  style::LineNumberPosition::INSIDE:
-                            aInfo.SetPos(LINENUMBER_POS_INSIDE);      ;
+                            aFontMetric.SetPos(LINENUMBER_POS_INSIDE);      ;
                         break;
                         case  style::LineNumberPosition::OUTSIDE:
-                            aInfo.SetPos(LINENUMBER_POS_OUTSIDE);
+                            aFontMetric.SetPos(LINENUMBER_POS_OUTSIDE);
                         break;
                     }
                 }
@@ -881,7 +881,7 @@ void SwXLineNumberingProperties::setPropertyValue(
                     sal_Int32 nTmp = convertMm100ToTwip(nVal);
                     if (nTmp > USHRT_MAX)
                         nTmp = USHRT_MAX;
-                    aInfo.SetPosFromLeft( static_cast< sal_uInt16 >(nTmp) );
+                    aFontMetric.SetPosFromLeft( static_cast< sal_uInt16 >(nTmp) );
                 }
                 break;
                 case WID_INTERVAL   :
@@ -889,14 +889,14 @@ void SwXLineNumberingProperties::setPropertyValue(
                     sal_Int16 nTmp = 0;
                     aValue >>= nTmp;
                     if( nTmp > 0)
-                        aInfo.SetCountBy(nTmp);
+                        aFontMetric.SetCountBy(nTmp);
                 }
                 break;
                 case WID_SEPARATOR_TEXT  :
                 {
                     OUString uTmp;
                     aValue >>= uTmp;
-                    aInfo.SetDivider(uTmp);
+                    aFontMetric.SetDivider(uTmp);
                 }
                 break;
                 case WID_SEPARATOR_INTERVAL:
@@ -904,29 +904,29 @@ void SwXLineNumberingProperties::setPropertyValue(
                     sal_Int16 nTmp = 0;
                     aValue >>= nTmp;
                     if( nTmp >= 0)
-                        aInfo.SetDividerCountBy(nTmp);
+                        aFontMetric.SetDividerCountBy(nTmp);
                 }
                 break;
                 case WID_COUNT_EMPTY_LINES :
                 {
                     bool bVal = *static_cast<sal_Bool const *>(aValue.getValue());
-                    aInfo.SetCountBlankLines(bVal);
+                    aFontMetric.SetCountBlankLines(bVal);
                 }
                 break;
                 case WID_COUNT_LINES_IN_FRAMES :
                 {
                     bool bVal = *static_cast<sal_Bool const *>(aValue.getValue());
-                    aInfo.SetCountInFlys(bVal);
+                    aFontMetric.SetCountInFlys(bVal);
                 }
                 break;
                 case WID_RESTART_AT_EACH_PAGE :
                 {
                     bool bVal = *static_cast<sal_Bool const *>(aValue.getValue());
-                    aInfo.SetRestartEachPage(bVal);
+                    aFontMetric.SetRestartEachPage(bVal);
                 }
                 break;
             }
-            pDoc->SetLineNumberInfo(aInfo);
+            pDoc->SetLineNumberInfo(aFontMetric);
         }
         else
             throw UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -1929,9 +1929,9 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
                                 static_cast<const SvxFontListItem* >(pLclDocShell
                                                     ->GetItem( SID_ATTR_CHAR_FONTLIST ));
                         const FontList*  pList = pFontListItem->GetFontList();
-                        FontMetric aInfo = pList->Get(
+                        FontMetric aFontMetric = pList->Get(
                             sBulletFontName, WEIGHT_NORMAL, ITALIC_NONE);
-                        vcl::Font aFont(aInfo);
+                        vcl::Font aFont(aFontMetric);
                         aFormat.SetBulletFont(&aFont);
                     }
                     else if (pBulletFontName)
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 87da652ca6c4..6ced44aed257 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1657,9 +1657,9 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                                         static_cast<const SvxFontListItem*>(pDoc->GetDocShell()
                                                             ->GetItem( SID_ATTR_CHAR_FONTLIST ));
                                 const FontList*  pList = pFontListItem->GetFontList();
-                                FontMetric aInfo = pList->Get(
+                                FontMetric aFontMetric = pList->Get(
                                     pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE);
-                                vcl::Font aFont(aInfo);
+                                vcl::Font aFont(aFontMetric);
                                 aFormat.SetBulletFont(&aFont);
                             }
                             aSetRule.Set( i, &aFormat );
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 3113fcc96118..c14956fa11db 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -1091,11 +1091,11 @@ static void ParseCSS1_font_family( const CSS1Expression *pExpr,
                     sal_Handle hFont = pFList->GetFirstFontMetric( aIdent );
                     if( nullptr != hFont )
                     {
-                        const FontMetric& rFInfo = FontList::GetFontMetric( hFont );
-                        if( RTL_TEXTENCODING_DONTKNOW != rFInfo.GetCharSet() )
+                        const FontMetric& rFMetric = FontList::GetFontMetric( hFont );
+                        if( RTL_TEXTENCODING_DONTKNOW != rFMetric.GetCharSet() )
                         {
                             bFound = true;
-                            if( RTL_TEXTENCODING_SYMBOL == rFInfo.GetCharSet() )
+                            if( RTL_TEXTENCODING_SYMBOL == rFMetric.GetCharSet() )
                                 eEnc = RTL_TEXTENCODING_SYMBOL;
                         }
                     }
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 14c0616bffca..6b168eceb677 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -3793,11 +3793,11 @@ void SwHTMLParser::NewFontAttr( int nToken )
                     sal_Handle hFont = pFList->GetFirstFontMetric( aFName );
                     if( nullptr != hFont )
                     {
-                        const FontMetric& rFInfo = FontList::GetFontMetric( hFont );
-                        if( RTL_TEXTENCODING_DONTKNOW != rFInfo.GetCharSet() )
+                        const FontMetric& rFMetric = FontList::GetFontMetric( hFont );
+                        if( RTL_TEXTENCODING_DONTKNOW != rFMetric.GetCharSet() )
                         {
                             bFound = true;
-                            if( RTL_TEXTENCODING_SYMBOL == rFInfo.GetCharSet() )
+                            if( RTL_TEXTENCODING_SYMBOL == rFMetric.GetCharSet() )
                                 eEnc = RTL_TEXTENCODING_SYMBOL;
                         }
                     }
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 6fb20a738e75..e3eecbd256d8 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -828,8 +828,8 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
         int nFontNames = m_pPrt->GetDevFontCount();
         for( int i = 0; i < nFontNames; i++ )
         {
-            FontMetric aInf( m_pPrt->GetDevFont( i ) );
-            aFontNames.insert( aInf.GetName() );
+            FontMetric aFontMetric( m_pPrt->GetDevFont( i ) );
+            aFontNames.insert( aFontMetric.GetName() );
         }
 
         // insert to listboxes
@@ -944,16 +944,16 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
     m_pLabelBox->SetText(sCapBackup );
     m_pIdxBox->SetText(sIdxBackup );
 
-    FontMetric aFontInfo( m_pFontList->Get(sStdBackup, sStdBackup) );
-    m_pStandardHeightLB->Fill( &aFontInfo, m_pFontList );
-    aFontInfo = m_pFontList->Get(sOutBackup, sOutBackup );
-    m_pTitleHeightLB->Fill( &aFontInfo, m_pFontList );
-    aFontInfo = m_pFontList->Get(sListBackup,sListBackup);
-    m_pListHeightLB->Fill( &aFontInfo, m_pFontList );
-    aFontInfo = m_pFontList->Get(sCapBackup, sCapBackup );
-    m_pLabelHeightLB->Fill( &aFontInfo, m_pFontList );
-    aFontInfo = m_pFontList->Get(sIdxBackup, sIdxBackup );
-    m_pIndexHeightLB->Fill( &aFontInfo, m_pFontList );
+    FontMetric aFontMetric( m_pFontList->Get(sStdBackup, sStdBackup) );
+    m_pStandardHeightLB->Fill( &aFontMetric, m_pFontList );
+    aFontMetric = m_pFontList->Get(sOutBackup, sOutBackup );
+    m_pTitleHeightLB->Fill( &aFontMetric, m_pFontList );
+    aFontMetric = m_pFontList->Get(sListBackup,sListBackup);
+    m_pListHeightLB->Fill( &aFontMetric, m_pFontList );
+    aFontMetric = m_pFontList->Get(sCapBackup, sCapBackup );
+    m_pLabelHeightLB->Fill( &aFontMetric, m_pFontList );
+    aFontMetric = m_pFontList->Get(sIdxBackup, sIdxBackup );
+    m_pIndexHeightLB->Fill( &aFontMetric, m_pFontList );
 
     m_pStandardHeightLB->SetValue( CalcToPoint( nStandardHeight, SFX_MAPUNIT_TWIP, 10 ) );
     m_pTitleHeightLB->   SetValue( CalcToPoint( nTitleHeight   , SFX_MAPUNIT_TWIP, 10 ) );
@@ -1083,8 +1083,8 @@ IMPL_LINK_TYPED( SwStdFontTabPage, LoseFocusHdl, Control&, rControl, void )
     {
         pHeightLB = m_pIndexHeightLB;
     }
-    FontMetric aFontInfo( m_pFontList->Get(sEntry, sEntry) );
-    pHeightLB->Fill( &aFontInfo, m_pFontList );
+    FontMetric aFontMetric( m_pFontList->Get(sEntry, sEntry) );
+    pHeightLB->Fill( &aFontMetric, m_pFontList );
 }
 
 void SwStdFontTabPage::PageCreated( const SfxAllItemSet& aSet)
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index b7f85947641e..b0ee67ead375 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -190,8 +190,8 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh,
             int nFontNames = pPrt->GetDevFontCount();
             for( int i = 0; i < nFontNames; i++ )
             {
-                FontMetric aInf( pPrt->GetDevFont( i ) );
-                aFontNames.insert( aInf.GetName() );
+                FontMetric aFontMetric( pPrt->GetDevFont( i ) );
+                aFontNames.insert( aFontMetric.GetName() );
             }
 
             // insert into listbox
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 6f961c2073a2..3a06617af7fa 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -988,10 +988,10 @@ void SwSrcEditWindow::SetFont()
     const SvxFontListItem* pFontListItem =
         static_cast<const SvxFontListItem* >(pSrcView->GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ));
     const FontList*  pList = pFontListItem->GetFontList();
-    FontMetric aInfo = pList->Get(sFontName,WEIGHT_NORMAL, ITALIC_NONE);
+    FontMetric aFontMetric = pList->Get(sFontName,WEIGHT_NORMAL, ITALIC_NONE);
 
     const vcl::Font& rFont = GetTextEngine()->GetFont();
-    vcl::Font aFont(aInfo);
+    vcl::Font aFont(aFontMetric);
     Size aSize(rFont.GetSize());
     //font height is stored in point and set in twip
     aSize.Height() =