summaryrefslogtreecommitdiff
path: root/editeng/source/rtf/rtfitem.cxx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2016-01-16 12:20:45 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2016-01-16 12:20:45 -0600
commit45654a1d4d96732912e6e4dc254c9612d3f241c0 (patch)
tree19f4ba915a56e53447980ce89fd46710167d7d23 /editeng/source/rtf/rtfitem.cxx
parent5d4f1f6f630d4382679087a4fb0da364c9c9692b (diff)
revert vcl patch series that brok Mac and Windows
revert: 9bc2f3de8672e812f3a67541c6d7069b434a7e42 vcl: add comment about ImplFontMetric::{Get|Set}LineHeight() 26371f105bc44e04469ec03fc5bb12505e651c6b vcl: FontAttributes::GetSlantType() -> FontAttributes::GetItalic() 2dd0b4317372b8022efe3911b38b4fa02956d8b9 vcl: font.hxx and metric.hxx cleanup, make ctors explicit and the dtor virtual 5ab13bf3ead3539e4ad847656da81e7eb6029652 vcl: tabify font.hxx f99550dae55e40e49bf9c9875053fe2abb4c71ca vcl: change Font::SetName() to Font::SetFamilyName() 2b297116cb6bb1061c43e5714e2609c8ee9f57d2 vcl: rename Font::GetName to Font::GetFamilyName Change-Id: I23f38921187d66b970ca815eb30dda4222a2da62
Diffstat (limited to 'editeng/source/rtf/rtfitem.cxx')
-rw-r--r--editeng/source/rtf/rtfitem.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 91d17414d980..68582a73073f 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -642,7 +642,7 @@ SET_FONTALIGNMENT:
{
const vcl::Font& rSVFont = GetFont( sal_uInt16(nTokenValue) );
SvxFontItem aTmpItem( rSVFont.GetFamily(),
- rSVFont.GetFamilyName(), rSVFont.GetStyleName(),
+ rSVFont.GetName(), rSVFont.GetStyleName(),
rSVFont.GetPitch(), rSVFont.GetCharSet(),
SID_ATTR_CHAR_FONT );
SetScriptAttr( eCharType, *pSet, aTmpItem );
@@ -1823,7 +1823,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
nValue = 0;
const vcl::Font& rSVFont = GetFont( sal_uInt16(nValue) );
SvxFontItem aTmpItem(
- rSVFont.GetFamily(), rSVFont.GetFamilyName(),
+ rSVFont.GetFamily(), rSVFont.GetName(),
rSVFont.GetStyleName(), rSVFont.GetPitch(),
rSVFont.GetCharSet(), SID_ATTR_CHAR_FONT );
SetScriptAttr( NOTDEF_CHARTYPE, aTmp, aTmpItem );