From 2a68ed19e8f35909e5dba691f9552099eae3162f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 11 Nov 2014 19:18:12 +0100 Subject: Revert "Some SvxFontHeightItem clean-up" This reverts commit d5f93eb47ec4c27e93ad908b0199790c702491a0, SvxFontHeightItem::SetProp was used to override "dummy" 100% nProp/ePropUnit values that did not match the computed nHeight value with nProp/ePropUnit values that are supposed to match the computed nHeight value. Yuck. Change-Id: Ic12e824054b3c5da7aca766b9b3eb076d1837d9a --- forms/source/richtext/rtattributehandler.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'forms') diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index 688068c8fc31..c9b90c0e5e33 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -336,9 +336,8 @@ namespace frm ).Height(); } - SvxFontHeightItem* pNewItem = new SvxFontHeightItem( - getWhich(), nHeight, pFontHeightItem->GetProp(), - pFontHeightItem->GetPropUnit() ); + SvxFontHeightItem* pNewItem = new SvxFontHeightItem( nHeight, 100, getWhich() ); + pNewItem->SetProp( pFontHeightItem->GetProp(), pFontHeightItem->GetPropUnit() ); aState.setItem( pNewItem ); } @@ -365,9 +364,8 @@ namespace frm ).Height(); } - SvxFontHeightItem aNewItem( - getWhich(), nHeight, pFontHeightItem->GetProp(), - pFontHeightItem->GetPropUnit() ); + SvxFontHeightItem aNewItem( nHeight, 100, getWhich() ); + aNewItem.SetProp( pFontHeightItem->GetProp(), pFontHeightItem->GetPropUnit() ); if ( ( getAttributeId() == SID_ATTR_CHAR_FONTHEIGHT ) && _nForScriptType ) putItemForScript( _rNewAttribs, aNewItem, _nForScriptType ); -- cgit