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 /editeng/source/editeng/editeng.cxx | |
| 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 'editeng/source/editeng/editeng.cxx')
| -rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index fee7a9bf6fcd..0493605e83cd 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2565,7 +2565,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const vcl::Font& rFont void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const SvxFont& rFont ) { rSet.Put( SvxLanguageItem( rFont.GetLanguage(), EE_CHAR_LANGUAGE ) ); - rSet.Put( SvxFontItem( rFont.GetFamily(), rFont.GetName(), OUString(), rFont.GetPitch(), rFont.GetCharSet(), EE_CHAR_FONTINFO ) ); + rSet.Put( SvxFontItem( rFont.GetFamily(), rFont.GetFamilyName(), OUString(), rFont.GetPitch(), rFont.GetCharSet(), EE_CHAR_FONTINFO ) ); rSet.Put( SvxFontHeightItem( rFont.GetSize().Height(), 100, EE_CHAR_FONTHEIGHT ) ); rSet.Put( SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH ) ); rSet.Put( SvxShadowedItem( rFont.IsShadow(), EE_CHAR_SHADOW ) ); |