summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-01-16 23:42:55 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-01-16 16:12:14 +0000
commitf99550dae55e40e49bf9c9875053fe2abb4c71ca (patch)
treea84bceecc809a336a81305a85edad78a4a8449c5 /cui
parent2b297116cb6bb1061c43e5714e2609c8ee9f57d2 (diff)
vcl: change Font::SetName() to Font::SetFamilyName()
Change-Id: I54a4036544c680c4a49607677af776aa7a433fbc Reviewed-on: https://gerrit.libreoffice.org/21510 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/cuicharmap.cxx2
-rw-r--r--cui/source/tabpages/chardlg.cxx4
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() );