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

Change-Id: Ie20871a3078bf875c1782b7761d60591a9c9704f
Reviewed-on: https://gerrit.libreoffice.org/21529
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

4 files changed, 10 insertions, 10 deletions

diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index b17931ca3df5..85f30403e488 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -164,9 +164,9 @@ short SvxCharacterMap::Execute()
             const SfxItemPool* pPool = pSet->GetPool();
             const vcl::Font& rFont( GetCharFont() );
             pSet->Put( SfxStringItem( pPool->GetWhich(SID_CHARMAP), GetCharacters() ) );
-            pSet->Put( SvxFontItem( rFont.GetFamily(), rFont.GetName(),
+            pSet->Put( SvxFontItem( rFont.GetFamily(), rFont.GetFamilyName(),
                 rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
-            pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), rFont.GetName() ) );
+            pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), rFont.GetFamilyName() ) );
             pSet->Put( SfxInt32Item( pPool->GetWhich(SID_ATTR_CHAR), GetChar() ) );
         }
     }
@@ -325,12 +325,12 @@ void SvxCharacterMap::init()
         m_pShowText->Hide();
     }
 
-    OUString aDefStr( aFont.GetName() );
+    OUString aDefStr( aFont.GetFamilyName() );
     OUString aLastName;
     int nCount = GetDevFontCount();
     for ( int i = 0; i < nCount; i++ )
     {
-        OUString aFontName( GetDevFont( i ).GetName() );
+        OUString aFontName( GetDevFont( i ).GetFamilyName() );
         if ( aFontName != aLastName )
         {
             aLastName = aFontName;
@@ -388,10 +388,10 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont )
     // like "Times New Roman;Times" resolved
     vcl::Font aTmp( GetFontMetric( rFont ) );
 
-    if ( m_pFontLB->GetEntryPos( aTmp.GetName() ) == LISTBOX_ENTRY_NOTFOUND )
+    if ( m_pFontLB->GetEntryPos( aTmp.GetFamilyName() ) == LISTBOX_ENTRY_NOTFOUND )
         return;
 
-    m_pFontLB->SelectEntry( aTmp.GetName() );
+    m_pFontLB->SelectEntry( aTmp.GetFamilyName() );
     aFont = aTmp;
     FontSelectHdl(*m_pFontLB);
 
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 362cdd12b87c..3625d82722d5 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -361,7 +361,7 @@ IMPL_LINK_TYPED(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void)
     {
         const FontMetric& rFontMetric = aFntLst.GetFontName( nFont );
         if(!bNonPropOnly || rFontMetric.GetPitch() == PITCH_FIXED)
-            m_pFontNameLB->InsertEntry(rFontMetric.GetName());
+            m_pFontNameLB->InsertEntry(rFontMetric.GetFamilyName());
     }
     m_pFontNameLB->SelectEntry(sFontName);
 }
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 2d6550eaccea..c3a5794b704f 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -530,7 +530,7 @@ namespace
         _rFont.SetLanguage(_pLanguageLB->GetSelectLanguage());
 
         _rFont.SetFamily( aFontMetrics.GetFamily() );
-        _rFont.SetName( aFontMetrics.GetName() );
+        _rFont.SetName( aFontMetrics.GetFamilyName() );
         _rFont.SetStyleName( aFontMetrics.GetStyleName() );
         _rFont.SetPitch( aFontMetrics.GetPitch() );
         _rFont.SetCharSet( aFontMetrics.GetCharSet() );
@@ -934,7 +934,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
     if ( nEntryPos >= m_pImpl->m_nExtraEntryPos )
         aStyleBoxText.clear();
     FontMetric aInfo( pFontList->Get( rFontName, aStyleBoxText ) );
-    SvxFontItem aFontItem( aInfo.GetFamily(), aInfo.GetName(), aInfo.GetStyleName(),
+    SvxFontItem aFontItem( aInfo.GetFamily(), aInfo.GetFamilyName(), aInfo.GetStyleName(),
                            aInfo.GetPitch(), aInfo.GetCharSet(), nWhich );
     pOld = GetOldItem( rSet, nSlot );
 
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 74c0f70dbe6d..325f93012c5b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -723,7 +723,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void)
                 aFmt.SetSuffix(OUString());
                 if( !pLevelSettings->sBulletFont.isEmpty() &&
                     pLevelSettings->sBulletFont.compareTo(
-                            rActBulletFont.GetName()))
+                            rActBulletFont.GetFamilyName()))
                 {
                     //search for the font
                     if(!pList)