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>

8 files changed, 12 insertions, 12 deletions

diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index a556fd3ef137..fdc9d6a65e02 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -83,7 +83,7 @@ void EditCharAttribFont::SetFont( SvxFont& rFont, OutputDevice* )
 {
     const SvxFontItem& rAttr = static_cast<const SvxFontItem&>(*GetItem());
 
-    rFont.SetName( rAttr.GetFamilyName() );
+    rFont.SetFamilyName( rAttr.GetFamilyName() );
     rFont.SetFamily( rAttr.GetFamily() );
     rFont.SetPitch( rAttr.GetPitch() );
     rFont.SetCharSet( rAttr.GetCharSet() );
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 58be84016e0b..f1207662c9fb 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2035,7 +2035,7 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, S
     if ( bSearchInParent || ( rSet.GetItemState( nWhich_FontInfo ) == SfxItemState::SET ) )
     {
         const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(rSet.Get( nWhich_FontInfo ));
-        rFont.SetName( rFontItem.GetFamilyName() );
+        rFont.SetFamilyName( rFontItem.GetFamilyName() );
         rFont.SetFamily( rFontItem.GetFamily() );
         rFont.SetPitch( rFontItem.GetPitch() );
         rFont.SetCharSet( rFontItem.GetCharSet() );
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index fac9787daa03..1cc860aa9a76 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2600,7 +2600,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
     if ( ( nScriptTypeI18N == i18n::ScriptType::ASIAN ) || ( nScriptTypeI18N == i18n::ScriptType::COMPLEX ) )
     {
         const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(pNode->GetContentAttribs().GetItem( GetScriptItemId( EE_CHAR_FONTINFO, nScriptType ) ));
-        rFont.SetName( rFontItem.GetFamilyName() );
+        rFont.SetFamilyName( rFontItem.GetFamilyName() );
         rFont.SetFamily( rFontItem.GetFamily() );
         rFont.SetPitch( rFontItem.GetPitch() );
         rFont.SetCharSet( rFontItem.GetCharSet() );
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 96264b678f18..199c50cfd002 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -79,9 +79,9 @@ vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
     rStream.ReadUInt16( nTemp ); aFont.SetStrikeout((FontStrikeout)nTemp);
     rStream.ReadUInt16( nTemp ); aFont.SetItalic((FontItalic)nTemp);
 
-    // UNICODE: rStream >> aName; aFont.SetName( aName );
+    // UNICODE: rStream >> aName; aFont.SetFamilyName( aName );
     OUString aName = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
-    aFont.SetName( aName );
+    aFont.SetFamilyName( aName );
 
     if( nVer == 1 )
     {
@@ -231,7 +231,7 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
 {
     vcl::Font _aFont = GetFont();
     vcl::Font aNewFont = rCopyFrom.GetFont();
-    _aFont.SetName( aNewFont.GetFamilyName() );
+    _aFont.SetFamilyName( aNewFont.GetFamilyName() );
     _aFont.SetFamily( aNewFont.GetFamily() );
     _aFont.SetStyleName( aNewFont.GetStyleName() );
     _aFont.SetColor( aNewFont.GetColor() );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 9e3d1500429c..b6247b4b4d3a 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -249,7 +249,7 @@ void SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverte
     {
         cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);
         OUString sFontName = GetFontToSubsFontName(pConverter);
-        pBulletFont->SetName(sFontName);
+        pBulletFont->SetFamilyName(sFontName);
     }
 
     rStream.WriteUInt16( NUMITEM_VERSION_04 );
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index f6ca4f8d39ab..869783e6f886 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -432,7 +432,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
                     case  17:
                     {
                         OUString sTemp; pValues[nProp] >>= sTemp;
-                        rSwFlags.aBulletFont.SetName(sTemp);
+                        rSwFlags.aBulletFont.SetFamilyName(sTemp);
                     }
                     break; // "Format/Option/ChangeToBullets/SpecialCharacter/Font",
                     case  18:
@@ -508,7 +508,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
                     case 43 :
                     {
                         OUString sTemp; pValues[nProp] >>= sTemp;
-                        rSwFlags.aByInputBulletFont.SetName(sTemp);
+                        rSwFlags.aByInputBulletFont.SetFamilyName(sTemp);
                     }
                     break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/Font",
                     case 44 :
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 83a804d343f0..893ee1a15b16 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -563,7 +563,7 @@ void SvxRTFParser::ReadFontTable()
             if (!sAltNm.isEmpty())
                 sFntNm = sFntNm + ";" + sAltNm;
 
-            pFont->SetName( sFntNm );
+            pFont->SetFamilyName( sFntNm );
             m_FontTable.insert(std::make_pair(nInsFontNo, std::move(pFont)));
             pFont.reset(new vcl::Font);
             pFont->SetCharSet( nSystemChar );
@@ -806,7 +806,7 @@ const vcl::Font& SvxRTFParser::GetFont( sal_uInt16 nId )
     }
     const SvxFontItem& rDfltFont = static_cast<const SvxFontItem&>(
                     pAttrPool->GetDefaultItem( aPlainMap.nFont ));
-    pDfltFont->SetName( rDfltFont.GetStyleName() );
+    pDfltFont->SetFamilyName( rDfltFont.GetStyleName() );
     pDfltFont->SetFamily( rDfltFont.GetFamily() );
     return *pDfltFont;
 }
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 897d2be6d110..dcc488599e6c 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star;
 
 void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, vcl::Font& rFont )
 {
-    rFont.SetName( rDesc.Name );
+    rFont.SetFamilyName( rDesc.Name );
     rFont.SetStyleName( rDesc.StyleName );
     rFont.SetSize( Size( rDesc.Width, rDesc.Height ) );
     rFont.SetFamily( (FontFamily)rDesc.Family );