From cb20f46895f0ec759f2bea95e499c6902deb60ca Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Mon, 18 Jan 2016 10:40:22 +1100 Subject: vcl: change Font::SetName() to Font::SetFamilyName() Change-Id: I9b7bd1ec25955981ebcb9085579cbb9fbaa802d5 Reviewed-on: https://gerrit.libreoffice.org/21560 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- cui/source/dialogs/cuicharmap.cxx | 2 +- cui/source/tabpages/chardlg.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 85f30403e488..fa4d3314e412 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 c3a5794b704f..458d6546d2fe 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(&( _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() ); -- cgit