mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Some SvxFontHeightItem clean-up"

Browse Source 
This reverts commit d5f93eb47e,
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
This commit is contained in:
Stephan Bergmann
2014-11-11 19:18:12 +01:00
parent 88a40e70fe
commit 2a68ed19e8
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forms/source/richtext/rtattributehandler.cxx
View File

@@ -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 );