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

3 files changed, 23 insertions, 22 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;
 }
 
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 );
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index a52da1841a0b..3ff3e64bd532 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -47,10 +47,6 @@ public:
     SvxFontHeightItem( const sal_uLong nSz /*= 240*/, const sal_uInt16 nPropHeight /*= 100*/,
                        const sal_uInt16 nId  );
 
-    SvxFontHeightItem(
-        sal_uInt16 wid, sal_uInt32 height, sal_uInt16 prop,
-        SfxMapUnit propUnit);
-
     // "pure virtual Methods" from SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
     virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
@@ -70,10 +66,8 @@ public:
 
     inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize)
         {
-            DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
-            nHeight = rSize.nHeight;
-            nProp = rSize.nProp;
-            ePropUnit = rSize.ePropUnit;
+            SetHeightValue( rSize.GetHeight() );
+            SetProp( rSize.GetProp(), ePropUnit );
             return *this;
         }
 
@@ -85,6 +79,20 @@ public:
 
     sal_uInt32 GetHeight() const { return nHeight; }
 
+    void SetHeightValue( sal_uInt32 nNewHeight )
+        {
+            DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
+            nHeight = nNewHeight;
+        }
+
+    void SetProp( const sal_uInt16 nNewProp,
+                    SfxMapUnit eUnit = SFX_MAPUNIT_RELATIVE )
+        {
+            DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
+            nProp = nNewProp;
+            ePropUnit = eUnit;
+        }
+
     sal_uInt16 GetProp() const { return nProp; }
 
     SfxMapUnit GetPropUnit() const { return ePropUnit;  }   // Percent, Twip, ...