diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-17 13:26:25 +1100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:25:56 -0400 |
commit | 49329d19eff5b5beffdeaa54242c9534f5b470c4 (patch) | |
tree | 85517ead7d4e926c17f9e52cda01475c3c93eaeb /cui | |
parent | 745d356d6b5b6b9308f35e89713288f17dd32503 (diff) |
vcl: rename Font::GetName to Font::GetFamilyName
Reviewed-on: https://gerrit.libreoffice.org/21529
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit 28c96fc2553a5c3dee108f1e2060d7bc081a7e7e)
Change-Id: Ie20871a3078bf875c1782b7761d60591a9c9704f
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 12 | ||||
-rw-r--r-- | cui/source/options/fontsubs.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 9449b13772a3..46ecefd0597e 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -159,9 +159,9 @@ 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.GetName(), + pSet->Put( SvxFontItem( rFont.GetFamily(), rFont.GetFamilyName(), rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), pPool->GetWhich(SID_ATTR_CHAR_FONT) ) ); - pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), rFont.GetName() ) ); + pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), rFont.GetFamilyName() ) ); pSet->Put( SfxInt32Item( pPool->GetWhich(SID_ATTR_CHAR), GetChar() ) ); } } @@ -317,12 +317,12 @@ void SvxCharacterMap::init() m_pShowText->Hide(); } - OUString aDefStr( aFont.GetName() ); + OUString aDefStr( aFont.GetFamilyName() ); OUString aLastName; int nCount = GetDevFontCount(); for ( int i = 0; i < nCount; i++ ) { - OUString aFontName( GetDevFont( i ).GetName() ); + OUString aFontName( GetDevFont( i ).GetFamilyName() ); if ( aFontName != aLastName ) { aLastName = aFontName; @@ -379,10 +379,10 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont ) // like "Times New Roman;Times" resolved vcl::Font aTmp( GetFontMetric( rFont ) ); - if ( m_pFontLB->GetEntryPos( aTmp.GetName() ) == LISTBOX_ENTRY_NOTFOUND ) + if ( m_pFontLB->GetEntryPos( aTmp.GetFamilyName() ) == LISTBOX_ENTRY_NOTFOUND ) return; - m_pFontLB->SelectEntry( aTmp.GetName() ); + m_pFontLB->SelectEntry( aTmp.GetFamilyName() ); aFont = aTmp; FontSelectHdl(*m_pFontLB); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 2130435bef02..e57fbfabe567 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -361,7 +361,7 @@ IMPL_LINK_TYPED(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void) { const vcl::FontInfo& rInfo = aFntLst.GetFontName( nFont ); if(!bNonPropOnly || rInfo.GetPitch() == PITCH_FIXED) - m_pFontNameLB->InsertEntry(rInfo.GetName()); + m_pFontNameLB->InsertEntry(rInfo.GetFamilyName()); } m_pFontNameLB->SelectEntry(sFontName); } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 5ac913d806a9..ea5fd82a10f3 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -524,7 +524,7 @@ namespace _rFont.SetLanguage(_pLanguageLB->GetSelectLanguage()); _rFont.SetFamily( aFontInfo.GetFamily() ); - _rFont.SetName( aFontInfo.GetName() ); + _rFont.SetName( aFontInfo.GetFamilyName() ); _rFont.SetStyleName( aFontInfo.GetStyleName() ); _rFont.SetPitch( aFontInfo.GetPitch() ); _rFont.SetCharSet( aFontInfo.GetCharSet() ); @@ -921,7 +921,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( nEntryPos >= m_pImpl->m_nExtraEntryPos ) aStyleBoxText.clear(); vcl::FontInfo aInfo( pFontList->Get( rFontName, aStyleBoxText ) ); - SvxFontItem aFontItem( aInfo.GetFamily(), aInfo.GetName(), aInfo.GetStyleName(), + SvxFontItem aFontItem( aInfo.GetFamily(), aInfo.GetFamilyName(), aInfo.GetStyleName(), aInfo.GetPitch(), aInfo.GetCharSet(), nWhich ); pOld = GetOldItem( rSet, nSlot ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index dfaf9e3ef064..4ac3f87ca52d 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -723,7 +723,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) aFmt.SetSuffix(OUString()); if( !pLevelSettings->sBulletFont.isEmpty() && pLevelSettings->sBulletFont.compareTo( - rActBulletFont.GetName())) + rActBulletFont.GetFamilyName())) { //search for the font if(!pList) |