summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-11 19:18:12 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-11 19:51:22 +0100
commit2a68ed19e8f35909e5dba691f9552099eae3162f (patch)
tree6588974e118c8f5824978664bdcc30d168ad8eb9 /forms
parent88a40e70fe921680ed303b8ab69ca866ae67078e (diff)
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
Diffstat (limited to 'forms')
-rw-r--r--forms/source/richtext/rtattributehandler.cxx10
1 files changed, 4 insertions, 6 deletions
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 );