From 5659b68be3acc08a1c70f1be05c99658f2b04e34 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Thu, 21 Jan 2016 03:30:10 +1100 Subject: vcl: rename Font::GetFamily to Font::GetFamilyType Change-Id: Ie427a43bd126dcdd89c6f66582736e67130f2254 Reviewed-on: https://gerrit.libreoffice.org/21633 Reviewed-by: Chris Sherlock Tested-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 fa4d3314e412..467fe8a769dd 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -164,7 +164,7 @@ 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.GetFamilyName(), + pSet->Put( SvxFontItem( rFont.GetFamilyType(), rFont.GetFamilyName(), rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), pPool->GetWhich(SID_ATTR_CHAR_FONT) ) ); pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), rFont.GetFamilyName() ) ); pSet->Put( SfxInt32Item( pPool->GetWhich(SID_ATTR_CHAR), GetChar() ) ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 458d6546d2fe..e90b3003d440 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -529,7 +529,7 @@ namespace _rFont.SetLanguage(_pLanguageLB->GetSelectLanguage()); - _rFont.SetFamily( aFontMetrics.GetFamily() ); + _rFont.SetFamily( aFontMetrics.GetFamilyType() ); _rFont.SetFamilyName( aFontMetrics.GetFamilyName() ); _rFont.SetStyleName( aFontMetrics.GetStyleName() ); _rFont.SetPitch( aFontMetrics.GetPitch() ); @@ -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.GetFamilyName(), aInfo.GetStyleName(), + SvxFontItem aFontItem( aInfo.GetFamilyType(), aInfo.GetFamilyName(), aInfo.GetStyleName(), aInfo.GetPitch(), aInfo.GetCharSet(), nWhich ); pOld = GetOldItem( rSet, nSlot ); -- cgit