diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-18 10:40:22 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-18 05:24:46 +0000 |
| commit | cb20f46895f0ec759f2bea95e499c6902deb60ca (patch) | |
| tree | e7790f7df9436a29ba8309d0ad99d518fb34d9ad /cui/source | |
| parent | 3b14cdf7386f41395d1b089c3b9dde7d4429cf38 (diff) | |
vcl: change Font::SetName() to Font::SetFamilyName()
Change-Id: I9b7bd1ec25955981ebcb9085579cbb9fbaa802d5
Reviewed-on: https://gerrit.libreoffice.org/21560
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
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<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() ); |