summaryrefslogtreecommitdiff
path: root/editeng
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 /editeng
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 'editeng')
-rw-r--r--editeng/source/items/textitem.cxx11
1 files changed, 3 insertions, 8 deletions
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 56be23996ec6..4a2bbd8b83a8 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -723,12 +723,7 @@ SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz,
SetHeight( nSz,nPrp ); // calculate in percentage
}
-SvxFontHeightItem::SvxFontHeightItem(
- sal_uInt16 wid, sal_uInt32 height, sal_uInt16 prop, SfxMapUnit propUnit):
- SfxPoolItem(wid)
-{
- SetHeight(height, prop, propUnit);
-}
+
SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const
{
@@ -776,8 +771,8 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
if( FONTHEIGHT_UNIT_VERSION <= nVersion )
rStrm.ReadUInt16( nPropUnit );
- SvxFontHeightItem* pItem = new SvxFontHeightItem(
- Which(), nsize, nprop, (SfxMapUnit)nPropUnit );
+ SvxFontHeightItem* pItem = new SvxFontHeightItem( nsize, 100, Which() );
+ pItem->SetProp( nprop, (SfxMapUnit)nPropUnit );
return pItem;
}