vcl: change Font::SetName() to Font::SetFamilyName()

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

13 files changed, 28 insertions, 28 deletions

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 8d128f6c831b..e1e86963fd02 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -103,7 +103,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
         pFont = new vcl::Font();
         pFont->SetWeight( WEIGHT_BOLD );
         pFont->SetStyleName( OUString() );
-        pFont->SetName("Arial Unicode");
+        pFont->SetFamilyName("Arial Unicode");
         pFont->SetFamily( FAMILY_SWISS );
         pFont->SetTransparent( true );
     }
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 3f52b090a5fe..e732c684ecb2 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -449,7 +449,7 @@ inline void SwFont::SetFamily( const FontFamily eFamily, const sal_uInt8 nWhich
 inline void SwSubFont::SetName( const OUString& rName )
 {
     m_pMagic = nullptr;
-    Font::SetName( rName );
+    Font::SetFamilyName( rName );
 }
 
 inline void SwFont::SetName( const OUString& rName, const sal_uInt8 nWhich )
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 08003e07f25a..c982844163c4 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -7370,7 +7370,7 @@ const vcl::Font& SwPageFrame::GetEmptyPageFont()
         pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt
         pEmptyPgFont->SetWeight( WEIGHT_BOLD );
         pEmptyPgFont->SetStyleName( aEmptyOUStr );
-        pEmptyPgFont->SetName("Helvetica");
+        pEmptyPgFont->SetFamilyName("Helvetica");
         pEmptyPgFont->SetFamily( FAMILY_SWISS );
         pEmptyPgFont->SetTransparent( true );
         pEmptyPgFont->SetColor( COL_GRAY );
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 06b524eb7e1c..5d47d9bc8064 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -492,7 +492,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
         {
             const SvxFontItem *pFont = static_cast<const SvxFontItem *>(pItem);
             m_aSub[SW_LATIN].SetFamily( pFont->GetFamily() );
-            m_aSub[SW_LATIN].Font::SetName( pFont->GetFamilyName() );
+            m_aSub[SW_LATIN].Font::SetFamilyName( pFont->GetFamilyName() );
             m_aSub[SW_LATIN].Font::SetStyleName( pFont->GetStyleName() );
             m_aSub[SW_LATIN].Font::SetPitch( pFont->GetPitch() );
             m_aSub[SW_LATIN].Font::SetCharSet( pFont->GetCharSet() );
@@ -522,7 +522,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
         {
             const SvxFontItem *pFont = static_cast<const SvxFontItem *>(pItem);
             m_aSub[SW_CJK].SetFamily( pFont->GetFamily() );
-            m_aSub[SW_CJK].Font::SetName( pFont->GetFamilyName() );
+            m_aSub[SW_CJK].Font::SetFamilyName( pFont->GetFamilyName() );
             m_aSub[SW_CJK].Font::SetStyleName( pFont->GetStyleName() );
             m_aSub[SW_CJK].Font::SetPitch( pFont->GetPitch() );
             m_aSub[SW_CJK].Font::SetCharSet( pFont->GetCharSet() );
@@ -558,7 +558,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
         {
             const SvxFontItem *pFont = static_cast<const SvxFontItem *>(pItem);
             m_aSub[SW_CTL].SetFamily( pFont->GetFamily() );
-            m_aSub[SW_CTL].Font::SetName( pFont->GetFamilyName() );
+            m_aSub[SW_CTL].Font::SetFamilyName( pFont->GetFamilyName() );
             m_aSub[SW_CTL].Font::SetStyleName( pFont->GetStyleName() );
             m_aSub[SW_CTL].Font::SetPitch( pFont->GetPitch() );
             m_aSub[SW_CTL].Font::SetCharSet( pFont->GetCharSet() );
@@ -758,7 +758,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet,
     {
         const SvxFontItem& rFont = pAttrSet->GetFont();
         m_aSub[SW_LATIN].SetFamily( rFont.GetFamily() );
-        m_aSub[SW_LATIN].SetName( rFont.GetFamilyName() );
+        m_aSub[SW_LATIN].SetFamilyName( rFont.GetFamilyName() );
         m_aSub[SW_LATIN].SetStyleName( rFont.GetStyleName() );
         m_aSub[SW_LATIN].SetPitch( rFont.GetPitch() );
         m_aSub[SW_LATIN].SetCharSet( rFont.GetCharSet() );
@@ -774,7 +774,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet,
     {
         const SvxFontItem& rFont = pAttrSet->GetCJKFont();
         m_aSub[SW_CJK].SetFamily( rFont.GetFamily() );
-        m_aSub[SW_CJK].SetName( rFont.GetFamilyName() );
+        m_aSub[SW_CJK].SetFamilyName( rFont.GetFamilyName() );
         m_aSub[SW_CJK].SetStyleName( rFont.GetStyleName() );
         m_aSub[SW_CJK].SetPitch( rFont.GetPitch() );
         m_aSub[SW_CJK].SetCharSet( rFont.GetCharSet() );
@@ -794,7 +794,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet,
     {
         const SvxFontItem& rFont = pAttrSet->GetCTLFont();
         m_aSub[SW_CTL].SetFamily( rFont.GetFamily() );
-        m_aSub[SW_CTL].SetName( rFont.GetFamilyName() );
+        m_aSub[SW_CTL].SetFamilyName( rFont.GetFamilyName() );
         m_aSub[SW_CTL].SetStyleName( rFont.GetStyleName() );
         m_aSub[SW_CTL].SetPitch( rFont.GetPitch() );
         m_aSub[SW_CTL].SetCharSet( rFont.GetCharSet() );
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index ed846b052d13..b0e95ff18f5f 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -692,7 +692,7 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFormat &rNum, WW8_ANLV const &rAV,
                                 ePitch, eCharSet ) ){
 
                 vcl::Font aFont;
-                aFont.SetName( aName );
+                aFont.SetFamilyName( aName );
                 aFont.SetFamily( eFamily );
 
                 aFont.SetCharSet( eCharSet );
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 0f457f9821f7..59e4c3debaca 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1096,11 +1096,11 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
         else
         {
             const SvxFontItem& rFontItem = pFormat->GetFont();
-            aFont.SetFamily(    rFontItem.GetFamily()     );
-            aFont.SetName(      rFontItem.GetFamilyName() );
-            aFont.SetStyleName( rFontItem.GetStyleName()  );
-            aFont.SetPitch(     rFontItem.GetPitch()      );
-            aFont.SetCharSet(   rFontItem.GetCharSet()    );
+            aFont.SetFamily(        rFontItem.GetFamily()     );
+            aFont.SetFamilyName(    rFontItem.GetFamilyName() );
+            aFont.SetStyleName(     rFontItem.GetStyleName()  );
+            aFont.SetPitch(         rFontItem.GetPitch()      );
+            aFont.SetCharSet(       rFontItem.GetCharSet()    );
         }
         aNumFormat.SetBulletFont( &aFont );
     }
@@ -2350,7 +2350,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString,
                 }
 
                 aTmp <<= OUString( pFontItem->GetFamilyName());
-                aFont.SetName( pFontItem->GetFamilyName() );
+                aFont.SetFamilyName( pFontItem->GetFamilyName() );
                 aFont.SetStyleName( pFontItem->GetStyleName() );
                 aFont.SetFamily( pFontItem->GetFamily() );
                 aFont.SetCharSet( pFontItem->GetCharSet() );
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 23779cc11090..3a2afb8b4e22 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -256,9 +256,9 @@ void SwDropCapsPict::GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _
     _rPage.rSh.GetCurAttr(aSet);
     SvxFontItem aFormatFont(static_cast<const SvxFontItem &>( aSet.Get(_nWhich)));
 
-    _rFont.SetFamily (aFormatFont.GetFamily());
-    _rFont.SetName   (aFormatFont.GetFamilyName());
-    _rFont.SetPitch  (aFormatFont.GetPitch());
+    _rFont.SetFamily(aFormatFont.GetFamily());
+    _rFont.SetFamilyName(aFormatFont.GetFamilyName());
+    _rFont.SetPitch(aFormatFont.GetPitch());
     _rFont.SetCharSet(aFormatFont.GetCharSet());
 }
 
@@ -304,9 +304,9 @@ void SwDropCapsPict::UpdatePaintSettings()
             OSL_ENSURE(pFormat, "character style doesn't exist!");
             const SvxFontItem &rFormatFont = pFormat->GetFont();
 
-            aFont.SetFamily (rFormatFont.GetFamily());
-            aFont.SetName   (rFormatFont.GetFamilyName());
-            aFont.SetPitch  (rFormatFont.GetPitch());
+            aFont.SetFamily(rFormatFont.GetFamily());
+            aFont.SetFamilyName(rFormatFont.GetFamilyName());
+            aFont.SetPitch(rFormatFont.GetPitch());
             aFont.SetCharSet(rFormatFont.GetCharSet());
         }
     }
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 5565cb7aa6de..20c8d748ba87 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -239,7 +239,7 @@ void SwInsFootNoteDlg::Init()
             aFont = m_pNumberCharEdit->GetFont();
             m_aFontName = rFont.GetFamilyName();
             eCharSet = rFont.GetCharSet();
-            aFont.SetName(m_aFontName);
+            aFont.SetFamilyName(m_aFontName);
             aFont.SetCharSet(eCharSet);
             bExtCharAvailable = true;
             rSh.Left( CRSR_SKIP_CHARS, false, 1, false );
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 89d26ccb7db4..6eae65389b70 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -566,7 +566,7 @@ static void lcl_SetFontProperties(
         const SvxPostureItem& rPostureItem )
 {
     rFont.SetFamily     ( rFontItem.GetFamily() );
-    rFont.SetName       ( rFontItem.GetFamilyName() );
+    rFont.SetFamilyName ( rFontItem.GetFamilyName() );
     rFont.SetStyleName  ( rFontItem.GetStyleName() );
     rFont.SetCharSet    ( rFontItem.GetCharSet() );
     rFont.SetPitch      ( rFontItem.GetPitch() );
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 3e8b08591ab1..23fc94c27914 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1714,7 +1714,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
             const SvxFontItem* pFontItem = SfxItemSet::GetItem<SvxFontItem>(pDlg->GetOutputItemSet(), SID_ATTR_CHAR_FONT, false);
             if ( pFontItem )
             {
-                aFont.SetName( pFontItem->GetFamilyName() );
+                aFont.SetFamilyName( pFontItem->GetFamilyName() );
                 aFont.SetStyleName( pFontItem->GetStyleName() );
                 aFont.SetCharSet( pFontItem->GetCharSet() );
                 aFont.SetPitch( pFontItem->GetPitch() );
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 65785150f0a3..b11d402ffc32 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2111,7 +2111,7 @@ void SwBaseShell::GetTextFontCtrlState( SfxItemSet& rSet )
                     vcl::Font aFont;
                     if(pI && dynamic_cast< const SvxFontItem *>( pI ) !=  nullptr)
                     {
-                        aFont.SetName( static_cast<const SvxFontItem*>(pI)->GetFamilyName());
+                        aFont.SetFamilyName( static_cast<const SvxFontItem*>(pI)->GetFamilyName());
                         aFont.SetStyleName(static_cast<const SvxFontItem*>(pI)->GetStyleName());
                         aFont.SetFamily(static_cast<const SvxFontItem*>(pI)->GetFamily());
                         aFont.SetPitch(static_cast<const SvxFontItem*>(pI)->GetPitch());
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 6072b7ef53dc..e7de13dc4e65 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -751,7 +751,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
             const SvxFontItem* pFontItem = SfxItemSet::GetItem<SvxFontItem>(pDlg->GetOutputItemSet(), SID_ATTR_CHAR_FONT, false);
             if ( pFontItem )
             {
-                aFont.SetName( pFontItem->GetFamilyName() );
+                aFont.SetFamilyName( pFontItem->GetFamilyName() );
                 aFont.SetStyleName( pFontItem->GetStyleName() );
                 aFont.SetCharSet( pFontItem->GetCharSet() );
                 aFont.SetPitch( pFontItem->GetPitch() );
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 058a82825620..d63b8cf1b2b1 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -946,7 +946,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
             const SvxFontItem* pFontItem = SfxItemSet::GetItem<SvxFontItem>(pDlg->GetOutputItemSet(), SID_ATTR_CHAR_FONT, false);
             if ( pFontItem )
             {
-                aNewFont.SetName( pFontItem->GetFamilyName() );
+                aNewFont.SetFamilyName( pFontItem->GetFamilyName() );
                 aNewFont.SetStyleName( pFontItem->GetStyleName() );
                 aNewFont.SetCharSet( pFontItem->GetCharSet() );
                 aNewFont.SetPitch( pFontItem->GetPitch() );