vcl: rename Font::GetName to Font::GetFamilyName

Change-Id: I83927e0992dfe0a2a79d139818a9f45d3761aae5
Reviewed-on: https://gerrit.libreoffice.org/21509
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>

6 files changed, 16 insertions, 22 deletions

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 1aa7a6ddca15..0b7e40db1523 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -673,7 +673,7 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl
                 if ((pImpl->m_bCJKEnabled) || (pImpl->m_bCTLEnabled))
                     pImpl->maText = makeRepresentativeTextForFont(LATIN, rFont);
                 else
-                    pImpl->maText = rFont.GetName();
+                    pImpl->maText = rFont.GetFamilyName();
 
                 if (pImpl->m_bCJKEnabled)
                 {
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 3cef94fd240c..71f8235a6881 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -82,7 +82,7 @@ using ::com::sun::star::awt::XVclWindowPeer;
 css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont )
 {
     css::awt::FontDescriptor aFD;
-    aFD.Name = rFont.GetName();
+    aFD.Name = rFont.GetFamilyName();
     aFD.StyleName = rFont.GetStyleName();
     aFD.Height = (sal_Int16)rFont.GetSize().Height();
     aFD.Width = (sal_Int16)rFont.GetSize().Width();
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 591d8ad6beff..2679bf40c0d5 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1533,10 +1533,8 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
                 if( eNumType == SVX_NUM_CHAR_SPECIAL)
             {
                 sal_Unicode cChar = aFmt.GetBulletChar();
-                //const vcl::Font* pFont = aFmt.GetBulletFont();
                 sal_Unicode ccChar = _pSet->sBulletChar[0];
-                // rtl::OUString sFont = _pSet->sBulletFont;
-                if ( !((cChar == ccChar) && //pFont && sFont.compareTo(pFont->GetName()) &&
+                if ( !((cChar == ccChar) &&
                     _pSet->eLabelFollowedBy == aFmt.GetLabelFollowedBy() &&
                     _pSet->nTabValue == aFmt.GetListtabPos() &&
                     _pSet->eNumAlign == aFmt.GetNumAdjust() &&
@@ -1600,8 +1598,6 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
     for (sal_uInt16 iLevel=0;iLevel < nCount;iLevel++)
     {
         SvxNumberFormat aFmt(aNum.GetLevel(iLevel));
-        //sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix())[0];
-        //sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix())[0];
         sal_Int16 eNumType = aFmt.GetNumberingType();
 
         NumSettings_Impl* _pSet = (*pItemArr->pNumSettingsArr)[iLevel].get();
@@ -1616,9 +1612,9 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
         {
             sal_Unicode cChar = aFmt.GetBulletChar();
             OUString sChar(cChar);
-            _pSet->sBulletChar = sChar;//OUString(cChar);
+            _pSet->sBulletChar = sChar;
             if ( aFmt.GetBulletFont() )
-                _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetName());
+                _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetFamilyName());
             _pSet->nNumberType = eNumType;
             pItemArr->bIsCustomized = true;
         }else if ((eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) {
@@ -1636,7 +1632,7 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
             _pSet->sSuffix = aFmt.GetSuffix();
             _pSet->nNumberType = eNumType;
             if ( aFmt.GetBulletFont() )
-                _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetName());
+                _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetFamilyName());
             pItemArr->bIsCustomized = true;
          }
     }
@@ -1667,7 +1663,6 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
     OutlineSettings_Impl* pItemArr = pOutlineSettingsArrs[nIndex];
     if (isDefault) pItemArr=pDefaultOutlineSettingsArrs[nIndex];
 
-    //Font& rActBulletFont = lcl_GetDefaultBulletFont();
     NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr;
 
     NumSettings_Impl* pLevelSettings = nullptr;
@@ -1681,7 +1676,6 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
             break;
 
         SvxNumberFormat aFmt(aNum.GetLevel(i));
-        //aFmt.SetBulletFont(&pLevelSettings->aFont);
         vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
         if (pLevelSettings->nNumberType !=aFmt.GetNumberingType()) isResetSize=true;
         aFmt.SetNumberingType( pLevelSettings->nNumberType );
@@ -1689,7 +1683,7 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
         if(aFmt.GetNumberingType() == SVX_NUM_CHAR_SPECIAL)
         {
             if( pLevelSettings->sBulletFont.getLength() &&
-                pLevelSettings->sBulletFont.compareTo(rActBulletFont.GetName()))
+                pLevelSettings->sBulletFont.compareTo(rActBulletFont.GetFamilyName()))
             {
                 //search for the font
                 if(!pList)
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 04d97c7c59a5..5710493f767b 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -411,9 +411,9 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
         vcl::Font aFnt(mpVD->GetFont());
         const sal_uInt32 nHeight(FRound(aFnt.GetSize().Height() * mfScaleY));
 
-        mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO ) );
-        mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO_CJK ) );
-        mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO_CTL ) );
+        mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetFamilyName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO ) );
+        mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetFamilyName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO_CJK ) );
+        mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetFamilyName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO_CTL ) );
         mpTextAttr->Put(SvxPostureItem(aFnt.GetItalic(), EE_CHAR_ITALIC));
         mpTextAttr->Put(SvxWeightItem(aFnt.GetWeight(), EE_CHAR_WEIGHT));
         mpTextAttr->Put( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT ) );
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 855fd69dbf3e..a761f74e71a7 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -727,7 +727,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
     // get DEFAULTFONT_LATIN_TEXT and set at pool as dynamic default
     vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne));
     aSvxFontItem.SetFamily(aFont.GetFamily());
-    aSvxFontItem.SetFamilyName(aFont.GetName());
+    aSvxFontItem.SetFamilyName(aFont.GetFamilyName());
     aSvxFontItem.SetStyleName(OUString());
     aSvxFontItem.SetPitch( aFont.GetPitch());
     aSvxFontItem.SetCharSet( aFont.GetCharSet() );
@@ -736,7 +736,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
     // get DEFAULTFONT_CJK_TEXT and set at pool as dynamic default
     vcl::Font aFontCJK(OutputDevice::GetDefaultFont(DefaultFontType::CJK_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne));
     aSvxFontItemCJK.SetFamily( aFontCJK.GetFamily());
-    aSvxFontItemCJK.SetFamilyName(aFontCJK.GetName());
+    aSvxFontItemCJK.SetFamilyName(aFontCJK.GetFamilyName());
     aSvxFontItemCJK.SetStyleName(OUString());
     aSvxFontItemCJK.SetPitch( aFontCJK.GetPitch());
     aSvxFontItemCJK.SetCharSet( aFontCJK.GetCharSet());
@@ -745,7 +745,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
     // get DEFAULTFONT_CTL_TEXT and set at pool as dynamic default
     vcl::Font aFontCTL(OutputDevice::GetDefaultFont(DefaultFontType::CTL_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne));
     aSvxFontItemCTL.SetFamily(aFontCTL.GetFamily());
-    aSvxFontItemCTL.SetFamilyName(aFontCTL.GetName());
+    aSvxFontItemCTL.SetFamilyName(aFontCTL.GetFamilyName());
     aSvxFontItemCTL.SetStyleName(OUString());
     aSvxFontItemCTL.SetPitch( aFontCTL.GetPitch() );
     aSvxFontItemCTL.SetCharSet( aFontCTL.GetCharSet());
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 67e2ab6b525f..fe83c23cff79 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1006,7 +1006,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
         aCurFont.SetPitch       ( pFontItem->GetPitch() );
         aCurFont.SetCharSet     ( pFontItem->GetCharSet() );
     }
-    OUString aCurName = aCurFont.GetName();
+    OUString aCurName = aCurFont.GetFamilyName();
     if ( GetText() != aCurName )
         SetText( aCurName );
 }
@@ -1145,7 +1145,7 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
             aCurFont.GetItalic() ) );
 
         SvxFontItem aFontItem( aFontMetric.GetFamily(),
-            aFontMetric.GetName(),
+            aFontMetric.GetFamilyName(),
             aFontMetric.GetStyleName(),
             aFontMetric.GetPitch(),
             aFontMetric.GetCharSet(),
@@ -1172,7 +1172,7 @@ void SvxFontNameBox_Impl::Select()
         aCurFont = aFontMetric;
 
         pFontItem.reset( new SvxFontItem( aFontMetric.GetFamily(),
-            aFontMetric.GetName(),
+            aFontMetric.GetFamilyName(),
             aFontMetric.GetStyleName(),
             aFontMetric.GetPitch(),
             aFontMetric.GetCharSet(),