[Libreoffice-commits] core.git: chart2/source cui/source editeng/source filter/source forms/source include/vcl reportdesign/source sc/source sd/source starmath/source svtools/source svx/source sw/source toolkit/source vcl/osx vcl/qa vcl/source vcl/win writerfilter/source

Chris Sherlock chris.sherlock79 at gmail.com
Sun Jan 17 21:25:15 PST 2016


 chart2/source/controller/dialogs/tp_DataSource.cxx      |    2 -
 chart2/source/view/main/DummyXShape.cxx                 |    2 -
 cui/source/dialogs/cuicharmap.cxx                       |    2 -
 cui/source/tabpages/chardlg.cxx                         |    4 +--
 editeng/source/editeng/editattr.cxx                     |    2 -
 editeng/source/editeng/editdoc.cxx                      |    2 -
 editeng/source/editeng/impedit3.cxx                     |    2 -
 editeng/source/items/bulitem.cxx                        |    6 ++---
 editeng/source/items/numitem.cxx                        |    2 -
 editeng/source/misc/acorrcfg.cxx                        |    4 +--
 editeng/source/rtf/svxrtf.cxx                           |    4 +--
 editeng/source/uno/unofdesc.cxx                         |    2 -
 filter/source/graphicfilter/ios2met/ios2met.cxx         |    2 -
 filter/source/graphicfilter/ipict/ipict.cxx             |    2 -
 filter/source/msfilter/svdfppt.cxx                      |    8 +++----
 filter/source/svg/svgfontexport.cxx                     |    2 -
 forms/source/richtext/richtextengine.cxx                |    5 ----
 include/vcl/font.hxx                                    |    2 -
 reportdesign/source/ui/misc/UITools.cxx                 |    2 -
 sc/source/core/data/patattr.cxx                         |    2 -
 sc/source/ui/miscdlgs/autofmt.cxx                       |    2 -
 sd/source/filter/eppt/pptx-text.cxx                     |    2 -
 sd/source/ui/func/bulmaper.cxx                          |    2 -
 sd/source/ui/func/fubullet.cxx                          |    2 -
 sd/source/ui/view/outlview.cxx                          |    2 -
 starmath/source/cfgitem.cxx                             |    4 +--
 starmath/source/dialog.cxx                              |    2 -
 starmath/source/unomodel.cxx                            |    2 -
 svtools/source/control/ctrltool.cxx                     |    4 +--
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |    4 +--
 svx/source/dialog/fntctrl.cxx                           |    4 +--
 svx/source/fmcomp/fmgridif.cxx                          |    2 -
 svx/source/styles/CommonStylePreviewRenderer.cxx        |    2 -
 svx/source/tbxctrls/tbcontrl.cxx                        |    4 +--
 svx/source/tbxctrls/tbunocontroller.cxx                 |    2 -
 sw/source/core/doc/notxtfrm.cxx                         |    2 -
 sw/source/core/inc/swfont.hxx                           |    2 -
 sw/source/core/layout/paintfrm.cxx                      |    2 -
 sw/source/core/txtnode/swfont.cxx                       |   12 +++++-----
 sw/source/filter/ww8/ww8par2.cxx                        |    2 -
 sw/source/filter/ww8/ww8par3.cxx                        |   12 +++++-----
 sw/source/ui/chrdlg/drpcps.cxx                          |   12 +++++-----
 sw/source/ui/misc/insfnote.cxx                          |    2 -
 sw/source/ui/table/tautofmt.cxx                         |    2 -
 sw/source/uibase/shells/annotsh.cxx                     |    2 -
 sw/source/uibase/shells/basesh.cxx                      |    2 -
 sw/source/uibase/shells/drwtxtsh.cxx                    |    2 -
 sw/source/uibase/shells/textsh.cxx                      |    2 -
 toolkit/source/helper/vclunohelper.cxx                  |    2 -
 vcl/osx/salframe.cxx                                    |    2 -
 vcl/qa/cppunit/font.cxx                                 |    2 -
 vcl/source/app/settings.cxx                             |    4 +--
 vcl/source/filter/sgvtext.cxx                           |    4 +--
 vcl/source/filter/wmf/winmtf.cxx                        |   18 ++++++++--------
 vcl/source/font/font.cxx                                |   10 ++++----
 vcl/source/gdi/cvtsvm.cxx                               |    2 -
 vcl/source/gdi/pdfwriter_impl.cxx                       |    4 +--
 vcl/source/outdev/font.cxx                              |   16 +++++++-------
 vcl/source/window/window2.cxx                           |    2 -
 vcl/win/gdi/salfont.cxx                                 |    2 -
 vcl/win/window/salframe.cxx                             |    2 -
 writerfilter/source/dmapper/SdtHelper.cxx               |    2 -
 62 files changed, 112 insertions(+), 115 deletions(-)

New commits:
commit cb20f46895f0ec759f2bea95e499c6902deb60ca
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Jan 18 10:40:22 2016 +1100

    vcl: change Font::SetName() to Font::SetFamilyName()
    
    Change-Id: I9b7bd1ec25955981ebcb9085579cbb9fbaa802d5
    Reviewed-on: https://gerrit.libreoffice.org/21560
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index b25390c..1039115 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -248,7 +248,7 @@ DataSourceTabPage::DataSourceTabPage(
     // set symbol font for arrows
     // note: StarSymbol is substituted to OpenSymbol for OOo
     vcl::Font aSymbolFont( m_pBTN_UP->GetFont());
-    aSymbolFont.SetName( "StarSymbol" );
+    aSymbolFont.SetFamilyName( "StarSymbol" );
     m_pBTN_UP->SetControlFont( aSymbolFont );
     m_pBTN_DOWN->SetControlFont( aSymbolFont );
 
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index fee3e34..e2e54df 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -757,7 +757,7 @@ struct FontAttribSetter
         if(rPropName == "CharFontName")
         {
             OUString aName = rProp.second.get<OUString>();
-            mrFont.SetName(aName);
+            mrFont.SetFamilyName(aName);
         }
         else if(rPropName == "CharColor")
         {
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 85f3040..fa4d331 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -96,7 +96,7 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte
     else if ( pFontNameItem )
     {
         vcl::Font aTmpFont( GetCharFont() );
-        aTmpFont.SetName( pFontNameItem->GetValue() );
+        aTmpFont.SetFamilyName( pFontNameItem->GetValue() );
         SetCharFont( aTmpFont );
     }
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index c3a5794..458d654 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -498,7 +498,7 @@ namespace
             if ( eState >= SfxItemState::DEFAULT )
             {
                 const SvxFontItem* pFontItem = static_cast<const SvxFontItem*>(&( _pPage->GetItemSet().Get( _nFontWhich ) ));
-                aFontMetrics.SetName(pFontItem->GetFamilyName());
+                aFontMetrics.SetFamilyName(pFontItem->GetFamilyName());
                 aFontMetrics.SetStyleName(pFontItem->GetStyleName());
                 aFontMetrics.SetFamily(pFontItem->GetFamily());
                 aFontMetrics.SetPitch(pFontItem->GetPitch());
@@ -530,7 +530,7 @@ namespace
         _rFont.SetLanguage(_pLanguageLB->GetSelectLanguage());
 
         _rFont.SetFamily( aFontMetrics.GetFamily() );
-        _rFont.SetName( aFontMetrics.GetFamilyName() );
+        _rFont.SetFamilyName( aFontMetrics.GetFamilyName() );
         _rFont.SetStyleName( aFontMetrics.GetStyleName() );
         _rFont.SetPitch( aFontMetrics.GetPitch() );
         _rFont.SetCharSet( aFontMetrics.GetCharSet() );
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index a556fd3..fdc9d6a 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 58be840..f120766 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 fac9787..1cc860a 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 96264b6..199c50c 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 9e3d150..b6247b4 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 f6ca4f8..869783e 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 83a804d..893ee1a 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 897d2be..dcc4885 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 );
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 9ec66e9..984f234 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2292,7 +2292,7 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize)
                         OUString aStr( str, strlen(str), osl_getThreadTextEncoding() );
                         if ( aStr.compareToIgnoreAsciiCase( "Helv" ) == 0 )
                             aStr = "Helvetica";
-                        pF->aFont.SetName( aStr );
+                        pF->aFont.SetFamilyName( aStr );
                         break;
                     }
                 }
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 00d5392..e7bbf71 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1571,7 +1571,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
         pPict->Read( &sFName, nLen );
         sFName[ nLen ] = 0;
         OUString aString( sFName, strlen(sFName), osl_getThreadTextEncoding() );
-        aActFont.SetName( aString );
+        aActFont.SetFamilyName( aString );
         eActMethod=PDM_UNDEFINED;
         break;
     }
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index c34f8dc..971b571 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2150,7 +2150,7 @@ bool SdrPowerPointImport::ReadFontCollection()
 
                 vcl::Font aFont;
                 aFont.SetCharSet( pFont->eCharSet );
-                aFont.SetName( pFont->aName );
+                aFont.SetFamilyName( pFont->aName );
                 aFont.SetFamily( pFont->eFamily );
                 aFont.SetPitch( pFont->ePitch );
                 aFont.SetHeight( 100 );
@@ -3631,7 +3631,7 @@ void PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx
             {
                 vcl::Font aFont;
                 aFont.SetCharSet( pFontEnityAtom->eCharSet );
-                aFont.SetName( pFontEnityAtom->aName );
+                aFont.SetFamilyName( pFontEnityAtom->aName );
                 aFont.SetFamily( pFontEnityAtom->eFamily );
                 aFont.SetPitch( pFontEnityAtom->ePitch );
                 rNumberFormat.SetBulletFont( &aFont );
@@ -3690,7 +3690,7 @@ bool PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx
                     {
                         vcl::Font aFont;
                         aFont.SetCharSet( pFontEnityAtom->eCharSet );
-                        aFont.SetName( pFontEnityAtom->aName );
+                        aFont.SetFamilyName( pFontEnityAtom->aName );
                         aFont.SetFamily( pFontEnityAtom->eFamily );
                         aFont.SetPitch( pFontEnityAtom->ePitch );
                         rNumberFormat.SetBulletFont( &aFont );
@@ -3710,7 +3710,7 @@ void PPTNumberFormatCreator::ImplGetNumberFormat( SdrPowerPointImport& rManager,
     if ( pAtom )
     {
         rtl_TextEncoding eCharSet( pAtom->eCharSet );
-        aFont.SetName( pAtom->aName );
+        aFont.SetFamilyName( pAtom->aName );
         aFont.SetCharSet( eCharSet );
         aFont.SetFamily( pAtom->eFamily );
         aFont.SetPitch( pAtom->ePitch );
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 823f0e9..16aa157 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -314,7 +314,7 @@ void SVGFontExport::EmbedFonts()
             {
                 vcl::Font aFont;
 
-                aFont.SetName( (*aGlyphTreeIter).first );
+                aFont.SetFamilyName( (*aGlyphTreeIter).first );
                 aFont.SetWeight( (*aFontWeightIter).first );
                 aFont.SetItalic( (*aFontItalicIter).first );
 
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 8043d00..f0d10d1 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -39,9 +39,6 @@
 
 namespace frm
 {
-
-
-
     //= RichTextEngine
 
 
@@ -62,7 +59,7 @@ namespace frm
 
         // defaults
         vcl::Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont();
-        aFont.SetName( "Times New Roman" );
+        aFont.SetFamilyName( "Times New Roman" );
         pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) );
 
         // 12 pt font size
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index e223ba3..a119f39 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -66,7 +66,7 @@ public:
     void                SetAlign( FontAlign );
     FontAlign           GetAlign() const;
 
-    void                SetName( const OUString& rFamilyName );
+    void                SetFamilyName( const OUString& rFamilyName );
     const OUString&     GetFamilyName() const;
     void                SetStyleName( const OUString& rStyleName );
     const OUString&     GetStyleName() const;
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 6a5263f..873d6bf 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -380,7 +380,7 @@ namespace
         if ( SfxItemState::SET == _rItemSet.GetItemState( _nFont,true,&pItem) && dynamic_cast< const SvxFontItem *>( pItem ) !=  nullptr)
         {
             const SvxFontItem* pFontItem = static_cast<const SvxFontItem*>(pItem);
-            aNewFont.SetName( pFontItem->GetFamilyName());
+            aNewFont.SetFamilyName(pFontItem->GetFamilyName());
             aNewFont.SetStyleName(pFontItem->GetStyleName());
             aNewFont.SetFamily(pFontItem->GetFamily());
             aNewFont.SetPitch(pFontItem->GetPitch());
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 21dc43f..01039b1 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -369,7 +369,7 @@ void ScPatternAttr::GetFont(
     //  FontItem:
 
     if (rFont.GetFamilyName() != pFontAttr->GetFamilyName())
-        rFont.SetName( pFontAttr->GetFamilyName() );
+        rFont.SetFamilyName( pFontAttr->GetFamilyName() );
     if (rFont.GetStyleName() != pFontAttr->GetStyleName())
         rFont.SetStyleName( pFontAttr->GetStyleName() );
 
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 7a91186..647c2d5 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -103,7 +103,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/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 51a4344..6398228 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -1410,7 +1410,7 @@ sal_uInt32 FontCollection::GetId( FontCollectionEntry& rEntry )
         }
         vcl::Font aFont;
         aFont.SetCharSet( rEntry.CharSet );
-        aFont.SetName( rEntry.Original );
+        aFont.SetFamilyName( rEntry.Original );
         aFont.SetHeight( 100 );
 
         if ( !pVDev )
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index 2f27d91..96316eb 100644
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -66,7 +66,7 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet&
             const SvxFontItem& rFItem =
                 static_cast<const SvxFontItem&>(rSet.Get(GetWhich( (sal_uInt16)nFontID )));
             aMyFont.SetFamily(rFItem.GetFamily());
-            aMyFont.SetName(rFItem.GetFamilyName());
+            aMyFont.SetFamilyName(rFItem.GetFamilyName());
             aMyFont.SetCharSet(rFItem.GetCharSet());
             aMyFont.SetPitch(rFItem.GetPitch());
 
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index d98fe2f..5e5d4fd 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -205,7 +205,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
             const SvxFontItem* pFItem = SfxItemSet::GetItem<SvxFontItem>(pDlg->GetOutputItemSet(), SID_ATTR_CHAR_FONT, false);
             if ( pFItem )
             {
-                aFont.SetName( pFItem->GetFamilyName() );
+                aFont.SetFamilyName( pFItem->GetFamilyName() );
                 aFont.SetStyleName( pFItem->GetStyleName() );
                 aFont.SetCharSet( pFItem->GetCharSet() );
                 aFont.SetPitch( pFItem->GetPitch() );
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index ab3e8ec..66bdc03 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -134,7 +134,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
     maBulletFont.SetColor( COL_AUTO );
     maBulletFont.SetHeight( 1000 );
     maBulletFont.SetCharSet(RTL_TEXTENCODING_MS_1252);   // and replacing other values by standard
-    maBulletFont.SetName( "StarSymbol" );
+    maBulletFont.SetFamilyName( "StarSymbol" );
     maBulletFont.SetWeight(WEIGHT_NORMAL);
     maBulletFont.SetUnderline(UNDERLINE_NONE);
     maBulletFont.SetStrikeout(STRIKEOUT_NONE);
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 1e1f9f9..24f626d 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -172,7 +172,7 @@ SmFontFormat::SmFontFormat( const vcl::Font &rFont )
 const vcl::Font SmFontFormat::GetFont() const
 {
     vcl::Font aRes;
-    aRes.SetName( aName );
+    aRes.SetFamilyName( aName );
     aRes.SetCharSet( (rtl_TextEncoding) nCharSet );
     aRes.SetFamily( (FontFamily) nFamily );
     aRes.SetPitch( (FontPitch) nPitch );
@@ -881,7 +881,7 @@ void SmMathConfig::LoadFormat()
                 if (bUseDefaultFont)
                 {
                     aFnt = pFormat->GetFont( i );
-                    aFnt.SetName( GetDefaultFontName( nLang, i ) );
+                    aFnt.SetFamilyName( GetDefaultFontName( nLang, i ) );
                 }
                 else
                 {
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index bf0a992..b6e9559 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -302,7 +302,7 @@ void SmShowFont::SetFont(const vcl::Font& rFont)
 
 IMPL_LINK_TYPED( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void )
 {
-    maFont.SetName(rComboBox.GetText());
+    maFont.SetFamilyName(rComboBox.GetText());
     m_pShowFont->SetFont(maFont);
 }
 
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 37592db..d0c7d79 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -661,7 +661,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
                     for (sal_uInt32 i = 0; i < nSize ; i++, pDescriptor++)
                     {
                         vcl::Font aFont;
-                        aFont.SetName ( pDescriptor->sFontName );
+                        aFont.SetFamilyName ( pDescriptor->sFontName );
                         aFont.SetCharSet ( static_cast < rtl_TextEncoding > (pDescriptor->nCharSet) );
                         aFont.SetFamily ( static_cast < FontFamily > (pDescriptor->nFamily ) );
                         aFont.SetPitch  ( static_cast < FontPitch >  (pDescriptor->nPitch ) );
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 1174cd8..ccbb3a1 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -649,7 +649,7 @@ FontMetric FontList::Get(const OUString& rName, const OUString& rStyleName) cons
         aInfo = *pFontMetric;
 
     // set Fontname to keep FontAlias
-    aInfo.SetName( rName );
+    aInfo.SetFamilyName( rName );
     aInfo.SetStyleName( rStyleName );
 
     return aInfo;
@@ -686,7 +686,7 @@ FontMetric FontList::Get(const OUString& rName,
         aInfo = *pFontMetric;
 
     // set Fontname to keep FontAlias
-    aInfo.SetName( rName );
+    aInfo.SetFamilyName( rName );
 
     return aInfo;
 }
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 5deea95..55d95ee 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -160,7 +160,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
     const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(pCustomShape->GetMergedItem( EE_CHAR_FONTINFO ));
     aFont.SetHeight( pCustomShape->GetLogicRect().GetHeight() / rFWData.nMaxParagraphsPerTextArea );
     aFont.SetAlign( ALIGN_TOP );
-    aFont.SetName( rFontItem.GetFamilyName() );
+    aFont.SetFamilyName( rFontItem.GetFamilyName() );
     aFont.SetFamily( rFontItem.GetFamily() );
     aFont.SetStyleName( rFontItem.GetStyleName() );
     aFont.SetOrientation( 0 );
@@ -248,7 +248,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
             aFont.SetHeight( rFWData.nSingleLineHeight );
             aFont.SetAlign( ALIGN_TOP );
 
-            aFont.SetName( rFontItem.GetFamilyName() );
+            aFont.SetFamilyName( rFontItem.GetFamilyName() );
             aFont.SetFamily( rFontItem.GetFamily() );
             aFont.SetStyleName( rFontItem.GetStyleName() );
             aFont.SetOrientation( 0 );
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 0b7e40d..682035c 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -878,7 +878,7 @@ static void SetPrevFont(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont
     {
         const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(rSet.Get(nWhich));
         rFont.SetFamily(rFontItem.GetFamily());
-        rFont.SetName(rFontItem.GetFamilyName());
+        rFont.SetFamilyName(rFontItem.GetFamilyName());
         rFont.SetPitch(rFontItem.GetPitch());
         rFont.SetCharSet(rFontItem.GetCharSet());
         rFont.SetStyleName(rFontItem.GetStyleName());
@@ -1415,7 +1415,7 @@ void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFo
     {
         const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>( rSet.Get(nWhich) );
         rFont.SetFamily( rFontItem.GetFamily() );
-        rFont.SetName( rFontItem.GetFamilyName() );
+        rFont.SetFamilyName( rFontItem.GetFamilyName() );
         rFont.SetPitch( rFontItem.GetPitch() );
         rFont.SetCharSet( rFontItem.GetCharSet() );
         rFont.SetStyleName( rFontItem.GetStyleName() );
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 71f8235..676ed96 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -105,7 +105,7 @@ css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont )
 vcl::Font ImplCreateFont( const css::awt::FontDescriptor& rDescr )
 {
     vcl::Font aFont;
-    aFont.SetName( rDescr.Name );
+    aFont.SetFamilyName( rDescr.Name );
     aFont.SetStyleName( rDescr.StyleName );
     aFont.SetSize( ::Size( rDescr.Width, rDescr.Height ) );
     aFont.SetFamily( (FontFamily)rDescr.Family );
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index 21876e9..a3b6c01 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -133,7 +133,7 @@ bool CommonStylePreviewRenderer::recalculate()
     if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_FONT)) != nullptr)
     {
         const SvxFontItem* pFontItem = static_cast<const SvxFontItem*>(pItem);
-        pFont->SetName(pFontItem->GetFamilyName());
+        pFont->SetFamilyName(pFontItem->GetFamilyName());
         pFont->SetStyleName(pFontItem->GetStyleName());
     }
     else
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index fe83c23..0b3d172 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -657,7 +657,7 @@ void SvxStyleBox_Impl::SetupEntry(vcl::RenderContext& rRenderContext, vcl::Windo
 
                 // setup the font properties
                 SvxFont aFont;
-                aFont.SetName(pFontItem->GetFamilyName());
+                aFont.SetFamilyName(pFontItem->GetFamilyName());
                 aFont.SetStyleName(pFontItem->GetStyleName());
                 aFont.SetSize(aPixelSize);
 
@@ -1000,7 +1000,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
 {
     if ( pFontItem )
     {
-        aCurFont.SetName        ( pFontItem->GetFamilyName() );
+        aCurFont.SetFamilyName  ( pFontItem->GetFamilyName() );
         aCurFont.SetFamily      ( pFontItem->GetFamily() );
         aCurFont.SetStyleName   ( pFontItem->GetStyleName() );
         aCurFont.SetPitch       ( pFontItem->GetPitch() );
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 5e51c2e..22ea34f 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -196,7 +196,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& rCurrentFo
     if ( !rCurrentFont.Name.isEmpty() )
     {
         FontMetric _aFontMetric;
-        _aFontMetric.SetName( rCurrentFont.Name );
+        _aFontMetric.SetFamilyName( rCurrentFont.Name );
         _aFontMetric.SetStyleName( rCurrentFont.StyleName );
         _aFontMetric.SetHeight( rCurrentFont.Height );
         Fill( &_aFontMetric, _pFontList );
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 8d128f6..e1e8696 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 3f52b09..e732c68 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 08003e0..c982844 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 06b524e..5d47d9b 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 ed846b0..b0e95ff 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 0f457f9..59e4c3d 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 23779cc..3a2afb8 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 5565cb7..20c8d74 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 89d26cc..6eae653 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 3e8b085..23fc94c 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 6578515..b11d402 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 6072b7e..e7de13d 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 058a828..d63b8cf 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() );
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 4be231b..ee802b4 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -389,7 +389,7 @@ vcl::Font VCLUnoHelper::CreateFont( const css::awt::FontDescriptor& rDescr, cons
 {
     vcl::Font aFont( rInitFont );
     if ( !rDescr.Name.isEmpty() )
-        aFont.SetName( rDescr.Name );
+        aFont.SetFamilyName( rDescr.Name );
     if ( !rDescr.StyleName.isEmpty() )
         aFont.SetStyleName( rDescr.StyleName );
     if ( rDescr.Height )
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 5aed7bb..66e0def 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1101,7 +1101,7 @@ static vcl::Font getFont( NSFont* pFont, long nDPIY, const vcl::Font& rDefault )
     vcl::Font aResult( rDefault );
     if( pFont )
     {
-        aResult.SetName( GetOUString( [pFont familyName] ) );
+        aResult.SetFamilyName( GetOUString( [pFont familyName] ) );
         aResult.SetHeight( static_cast<int>(([pFont pointSize] * 72.0 / (float)nDPIY)+0.5) );
         aResult.SetItalic( ([pFont italicAngle] != 0.0) ? ITALIC_NORMAL : ITALIC_NONE );
         // FIMXE: bold ?
diff --git a/vcl/qa/cppunit/font.cxx b/vcl/qa/cppunit/font.cxx
index a6e008b..a8532a9 100644
--- a/vcl/qa/cppunit/font.cxx
+++ b/vcl/qa/cppunit/font.cxx
@@ -44,7 +44,7 @@ void VclFontTest::testName()
 
     CPPUNIT_ASSERT_MESSAGE( "Family name should be empty", aFont.GetFamilyName().isEmpty());
     CPPUNIT_ASSERT_MESSAGE( "Style name should be empty", aFont.GetStyleName().isEmpty());
-    aFont.SetName("Test family name");
+    aFont.SetFamilyName("Test family name");
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "Family name should not be empty", OUString("Test family name"), aFont.GetFamilyName());
     aFont.SetStyleName("Test style name");
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "Style name should not be empty", OUString("Test style name"), aFont.GetStyleName());
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 70a56a3..296684b 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -686,9 +686,9 @@ void ImplStyleData::SetStandardStyles()
     aStdFont.SetCharSet( osl_getThreadTextEncoding() );
     aStdFont.SetWeight( WEIGHT_NORMAL );
     if (!utl::ConfigManager::IsAvoidConfig())
-        aStdFont.SetName(utl::DefaultFontConfiguration::get().getUserInterfaceFont(LanguageTag("en")));
+        aStdFont.SetFamilyName(utl::DefaultFontConfiguration::get().getUserInterfaceFont(LanguageTag("en")));
     else
-        aStdFont.SetName("Liberation Serif");
+        aStdFont.SetFamilyName("Liberation Serif");
     maAppFont                   = aStdFont;
     maHelpFont                  = aStdFont;
     maMenuFont                  = aStdFont;
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 3686e6ec..90070a4 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -473,7 +473,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u
         if (pSgfFont->Fixd) aFont.SetPitch(PITCH_FIXED); else aFont.SetPitch(PITCH_VARIABLE);
         aFont.SetFamily(pSgfFont->SVFamil);
         aFont.SetCharSet(pSgfFont->SVChSet);
-        aFont.SetName(FNam);
+        aFont.SetFamilyName(FNam);
     }
     else
     {  // if not in Inifile, some fonts are hard coded here
@@ -509,7 +509,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u
           } break;
           default: FNam = "Helvetica";
         }
-        aFont.SetName(FNam);
+        aFont.SetFamilyName(FNam);
         //aFont.SetCharSet(CHARSET_SYSTEM);
     }
 
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index c19642a..17db14d 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -151,7 +151,7 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
     if ( eCharSet == RTL_TEXTENCODING_DONTKNOW )
         eCharSet = RTL_TEXTENCODING_MS_1252;
     aFont.SetCharSet( eCharSet );
-    aFont.SetName( rFont.alfFaceName );
+    aFont.SetFamilyName( rFont.alfFaceName );
     FontFamily eFamily;
     switch ( rFont.lfPitchAndFamily & 0xf0 )
     {
@@ -852,14 +852,14 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) :
 {
     mbIsMapWinSet = false;
     mbIsMapDevSet = false;
-    mpGDIMetaFile->AddAction( new MetaPushAction( PushFlags::CLIPREGION ) );      // The original clipregion has to be on top
-                                                                            // of the stack so it can always be restored
-                                                                            // this is necessary to be able to support
-                                                                            // SetClipRgn( NULL ) and similar ClipRgn actions (SJ)
-
-    maFont.SetName( "Arial" );                                              // sj: #i57205#, we do have some scaling problems if using
-    maFont.SetCharSet( RTL_TEXTENCODING_MS_1252 );                          // the default font then most times a x11 font is used, we
-    maFont.SetHeight( 423 );                                                // will prevent this defining a font
+    mpGDIMetaFile->AddAction( new MetaPushAction( PushFlags::CLIPREGION ) ); // The original clipregion has to be on top
+                                                                             // of the stack so it can always be restored
+                                                                             // this is necessary to be able to support
+                                                                             // SetClipRgn( NULL ) and similar ClipRgn actions (SJ)
+
+    maFont.SetFamilyName( "Arial" );                                         // sj: #i57205#, we do have some scaling problems if using
+    maFont.SetCharSet( RTL_TEXTENCODING_MS_1252 );                           // the default font then most times a x11 font is used, we
+    maFont.SetHeight( 423 );                                                 // will prevent this defining a font
 
     maLatestLineStyle.aLineColor = Color( 0x12, 0x34, 0x56 );
     maLatestFillStyle.aFillColor = Color( 0x12, 0x34, 0x56 );
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 8c69ea6..8cca361 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -137,7 +137,7 @@ void Font::SetAlign( FontAlign eAlign )
     }
 }
 
-void Font::SetName( const OUString& rFamilyName )
+void Font::SetFamilyName( const OUString& rFamilyName )
 {
     MakeUnique();
     mpImplFont->SetFamilyName( rFamilyName );
@@ -411,7 +411,7 @@ void Font::Merge( const vcl::Font& rFont )
 {
     if ( !rFont.GetFamilyName().isEmpty() )
     {
-        SetName( rFont.GetFamilyName() );
+        SetFamilyName( rFont.GetFamilyName() );
         SetStyleName( rFont.GetStyleName() );
         SetCharSet( GetCharSet() );
         SetLanguageTag( rFont.GetLanguageTag() );
@@ -573,9 +573,9 @@ namespace
             GetTTGlobalFontInfo( pTTF, &aInfo );
             // most importantly: the family name
             if( aInfo.ufamily )
-                o_rResult.SetName( aInfo.ufamily );
+                o_rResult.SetFamilyName( aInfo.ufamily );
             else if( aInfo.family )
-                o_rResult.SetName( OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) );
+                o_rResult.SetFamilyName( OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) );
             // set weight
             if( aInfo.weight )
             {
@@ -690,7 +690,7 @@ namespace
                     pClose++;
                 if( pClose - pOpen > 1 )
                 {
-                    o_rResult.SetName( OStringToOUString( OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) );
+                    o_rResult.SetFamilyName( OStringToOUString( OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) );
                 }
             }
 
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 0fd6d3a..c561a39 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -817,7 +817,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     ImplReadColor( rIStm, aActionColor ); aFont.SetColor( aActionColor );
                     ImplReadColor( rIStm, aActionColor ); aFont.SetFillColor( aActionColor );
                     rIStm.Read( aName, 32 );
-                    aFont.SetName( OUString( aName, strlen(aName), rIStm.GetStreamCharSet() ) );
+                    aFont.SetFamilyName( OUString( aName, strlen(aName), rIStm.GetStreamCharSet() ) );
                     rIStm.ReadInt32( nWidth ).ReadInt32( nHeight );
                     rIStm.ReadInt16( nCharOrient ).ReadInt16( nLineOrient );
                     rIStm.ReadInt16( nCharSet ).ReadInt16( nFamily ).ReadInt16( nPitch ).ReadInt16( nAlign ).ReadInt16( nWeight ).ReadInt16( nUnderline ).ReadInt16( nStrikeout );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 891a6d2..3197ed3 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1783,7 +1783,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal
     m_aStructure[0].m_nParentElement    = 0;
 
     Font aFont;
-    aFont.SetName( "Times" );
+    aFont.SetFamilyName( "Times" );
     aFont.SetSize( Size( 0, 12 ) );
 
     GraphicsState aState;
@@ -2316,7 +2316,7 @@ void PDFWriterImpl::endPage()
 
         // reset the default font
         Font aFont;
-        aFont.SetName( "Times" );
+        aFont.SetFamilyName( "Times" );
         aFont.SetSize( Size( 0, 12 ) );
 
         m_aCurrentPDFState = m_aGraphicsStack.front();
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 99d2109..8fa55ca 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -74,7 +74,7 @@ FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const
     if( nDevFontIndex < nCount )
     {
         const PhysicalFontFace& rData = *mpDeviceFontList->Get( nDevFontIndex );
-        aFontMetric.SetName( rData.GetFamilyName() );
+        aFontMetric.SetFamilyName( rData.GetFamilyName() );
         aFontMetric.SetStyleName( rData.GetStyleName() );
         aFontMetric.SetCharSet( rData.GetCharSet() );
         aFontMetric.SetFamily( rData.GetFamilyType() );
@@ -195,7 +195,7 @@ FontMetric OutputDevice::GetFontMetric() const
     aMetric.Font::operator=( maFont );
 
     // set aMetric with info from font
-    aMetric.SetName( maFont.GetFamilyName() );
+    aMetric.SetFamilyName( maFont.GetFamilyName() );
     aMetric.SetStyleName( xFontMetric->GetStyleName() );
     aMetric.SetSize( PixelToLogic( Size( xFontMetric->GetWidth(), xFontMetric->GetAscent() + xFontMetric->GetDescent() - xFontMetric->GetInternalLeading() ) ) );
     aMetric.SetCharSet( xFontMetric->IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE );
@@ -879,7 +879,7 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan
                 }
             }
             while ( nIndex != -1 );
-            aFont.SetName( aName );
+            aFont.SetFamilyName( aName );
         }
 
         // No Name, than set all names
@@ -891,13 +891,13 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan
                 {
                     SAL_WARN ("vcl.gdi", "No default window has been set for the application - we really shouldn't be able to get here");
                     sal_Int32 nIndex = 0;
-                    aFont.SetName( aSearch.getToken( 0, ';', nIndex ) );
+                    aFont.SetFamilyName( aSearch.getToken( 0, ';', nIndex ) );
                 }
                 else
                 {
                     pOutDev->ImplInitFontList();
 
-                    aFont.SetName( aSearch );
+                    aFont.SetFamilyName( aSearch );
 
                     // convert to pixel height
                     Size aSize = pOutDev->ImplLogicToDevicePixel( aFont.GetSize() );
@@ -920,15 +920,15 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan
                     if (pFontInstance)
                     {
                         if( pFontInstance->maFontSelData.mpFontData )
-                            aFont.SetName( pFontInstance->maFontSelData.mpFontData->GetFamilyName() );
+                            aFont.SetFamilyName( pFontInstance->maFontSelData.mpFontData->GetFamilyName() );
                         else
-                            aFont.SetName( pFontInstance->maFontSelData.maTargetName );
+                            aFont.SetFamilyName( pFontInstance->maFontSelData.maTargetName );
                         pOutDev->mpFontCache->Release(pFontInstance);
                     }
                 }
             }
             else
-                aFont.SetName( aSearch );
+                aFont.SetFamilyName( aSearch );
         }
     }
 
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index be85aa3..d1f0d99 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -483,7 +483,7 @@ void Window::SetZoomedPointFont(vcl::RenderContext& rRenderContext, const vcl::F
             else
                 nType = DefaultFontType::UI_SANS;
             vcl::Font aTempFont = OutputDevice::GetDefaultFont(nType, rRenderContext.GetSettings().GetLanguageTag().getLanguageType(), GetDefaultFontFlags::NONE);
-            aFont.SetName(aTempFont.GetFamilyName());
+            aFont.SetFamilyName(aTempFont.GetFamilyName());
             SetPointFont(rRenderContext, aFont);
         }
     }
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index b95e9f5..c8b63d2 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -868,7 +868,7 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
     OUString aFontName( reinterpret_cast<const sal_Unicode*>(rLogFont.lfFaceName) );
     if (!aFontName.isEmpty())
     {
-        rFont.SetName( aFontName );
+        rFont.SetFamilyName( aFontName );
         rFont.SetCharSet( ImplCharSetToSal( rLogFont.lfCharSet ) );
         rFont.SetFamily( ImplFamilyToSal( rLogFont.lfPitchAndFamily ) );
         rFont.SetPitch( ImplLogPitchToSal( rLogFont.lfPitchAndFamily ) );
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index c24fce1..8230ffb 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2792,7 +2792,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
         if ( aFirstName.equalsIgnoreAsciiCase( "MS Sans Serif" ) )
         {
             aFontName = "Arial;" + aFontName;
-            aAppFont.SetName( aFontName );
+            aAppFont.SetFamilyName( aFontName );
         }
     }
     aStyleSettings.SetAppFont( aAppFont );
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index 12cce7bf..79601b3 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -41,7 +41,7 @@ awt::Size lcl_getOptimalWidth(StyleSheetTablePtr pStyleSheet, OUString& rDefault
     vcl::Font aFont(pOut->GetFont());
     boost::optional<PropertyMap::Property> aFontName = pDefaultCharProps->getProperty(PROP_CHAR_FONT_NAME);
     if (aFontName)
-        aFont.SetName(aFontName->second.get<OUString>());
+        aFont.SetFamilyName(aFontName->second.get<OUString>());
     boost::optional<PropertyMap::Property> aHeight = pDefaultCharProps->getProperty(PROP_CHAR_HEIGHT);
     if (aHeight)
     {


More information about the Libreoffice-commits mailing list