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

Some SvxFontHeightItem clean-up

Browse Source 
...and operator= shall probably copy rSize.ePropUnit...

Change-Id: I112c02b3a3b2ce23f3d03f03881136e05be29017
This commit is contained in:
Stephan Bergmann
2014-11-11 18:39:20 +01:00
parent 047830de46
commit d5f93eb47e
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
editeng/source/items/textitem.cxx
View File

@@ -723,7 +723,12 @@ SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz,
SetHeight( nSz,nPrp ); // calculate in percentage 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 SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const
{ {
@@ -771,8 +776,8 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
if( FONTHEIGHT_UNIT_VERSION <= nVersion ) if( FONTHEIGHT_UNIT_VERSION <= nVersion )
rStrm.ReadUInt16( nPropUnit ); rStrm.ReadUInt16( nPropUnit );
SvxFontHeightItem* pItem = new SvxFontHeightItem( nsize, 100, Which() ); SvxFontHeightItem* pItem = new SvxFontHeightItem(
pItem->SetProp( nprop, (SfxMapUnit)nPropUnit ); Which(), nsize, nprop, (SfxMapUnit)nPropUnit );
return pItem; return pItem;
} }

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

@@ -336,8 +336,9 @@ namespace frm
).Height(); ).Height();
} }
SvxFontHeightItem* pNewItem = new SvxFontHeightItem( nHeight, 100, getWhich() ); SvxFontHeightItem* pNewItem = new SvxFontHeightItem(
pNewItem->SetProp( pFontHeightItem->GetProp(), pFontHeightItem->GetPropUnit() ); getWhich(), nHeight, pFontHeightItem->GetProp(),
pFontHeightItem->GetPropUnit() );
aState.setItem( pNewItem ); aState.setItem( pNewItem );
} }
@@ -364,8 +365,9 @@ namespace frm
).Height(); ).Height();
} }
SvxFontHeightItem aNewItem( nHeight, 100, getWhich() ); SvxFontHeightItem aNewItem(
aNewItem.SetProp( pFontHeightItem->GetProp(), pFontHeightItem->GetPropUnit() ); getWhich(), nHeight, pFontHeightItem->GetProp(),
pFontHeightItem->GetPropUnit() );
if ( ( getAttributeId() == SID_ATTR_CHAR_FONTHEIGHT ) && _nForScriptType ) if ( ( getAttributeId() == SID_ATTR_CHAR_FONTHEIGHT ) && _nForScriptType )
putItemForScript( _rNewAttribs, aNewItem, _nForScriptType ); putItemForScript( _rNewAttribs, aNewItem, _nForScriptType );

24
include/editeng/fhgtitem.hxx
View File

@@ -47,6 +47,10 @@ public:
SvxFontHeightItem( const sal_uLong nSz /*= 240*/, const sal_uInt16 nPropHeight /*= 100*/, SvxFontHeightItem( const sal_uLong nSz /*= 240*/, const sal_uInt16 nPropHeight /*= 100*/,
const sal_uInt16 nId ); const sal_uInt16 nId );
SvxFontHeightItem(
sal_uInt16 wid, sal_uInt32 height, sal_uInt16 prop,
SfxMapUnit propUnit);
// "pure virtual Methods" from SfxPoolItem // "pure virtual Methods" from SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
@@ -66,8 +70,10 @@ public:
inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize)
{ {
SetHeightValue( rSize.GetHeight() ); DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
SetProp( rSize.GetProp(), ePropUnit ); nHeight = rSize.nHeight;
nProp = rSize.nProp;
ePropUnit = rSize.ePropUnit;
return *this; return *this;
} }
@@ -79,20 +85,6 @@ public:
sal_uInt32 GetHeight() const { return nHeight; } 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; } sal_uInt16 GetProp() const { return nProp; }
SfxMapUnit GetPropUnit() const { return ePropUnit; } // Percent, Twip, ... SfxMapUnit GetPropUnit() const { return ePropUnit; } // Percent, Twip, ...