From bec72dd34f8aa7419c6159bdf02c5ba34a6228a8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 25 Sep 2014 06:07:13 +0200 Subject: remove unnecessary casts in calls to SvStream.WriteUChar left over from our conversion of the SvStream output operators to more specific methods Change-Id: I2ea4c7d97e745b3e6a3834f41ac7bfefa4883c7a --- editeng/source/items/optitems.cxx | 4 ++-- editeng/source/items/paraitem.cxx | 8 ++++---- editeng/source/items/textitem.cxx | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'editeng') diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index d9ea20fbb9a9..8dce77f48885 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -155,8 +155,8 @@ SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const SvStream& SfxHyphenRegionItem::Store( SvStream& rStrm, sal_uInt16 ) const { - rStrm.WriteUChar( (sal_uInt8) GetMinLead() ) - .WriteUChar( (sal_uInt8) GetMinTrail() ); + rStrm.WriteUChar( GetMinLead() ) + .WriteUChar( GetMinTrail() ); return rStrm; } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 9791c806e572..56d29e297b30 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -1164,8 +1164,8 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const SvxTabStop& rTab = (*this)[ i ]; rStrm.WriteInt32( rTab.GetTabPos() ) .WriteSChar( (sal_Int8) rTab.GetAdjustment() ) - .WriteUChar( (unsigned char) rTab.GetDecimal() ) - .WriteUChar( (unsigned char) rTab.GetFill() ); + .WriteUChar( rTab.GetDecimal() ) + .WriteUChar( rTab.GetFill() ); } if ( bStoreDefTabs ) @@ -1174,8 +1174,8 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) SvxTabStop aSwTabStop(nNew, SVX_TAB_ADJUST_DEFAULT); rStrm.WriteInt32( aSwTabStop.GetTabPos() ) .WriteSChar( (sal_Int8) aSwTabStop.GetAdjustment() ) - .WriteUChar( (unsigned char) aSwTabStop.GetDecimal() ) - .WriteUChar( (unsigned char) aSwTabStop.GetFill() ); + .WriteUChar( aSwTabStop.GetDecimal() ) + .WriteUChar( aSwTabStop.GetFill() ); nNew += nDefDist; } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index c47215ede3c5..78954f0c3420 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -372,8 +372,8 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co { bool bToBats = IsStarSymbol( GetFamilyName() ); - rStrm.WriteUChar( (sal_uInt8) GetFamily() ).WriteUChar( (sal_uInt8) GetPitch() ) - .WriteUChar( (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet())) ); + rStrm.WriteUChar( GetFamily() ).WriteUChar( GetPitch() ) + .WriteUChar( (bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet())) ); OUString aStoreFamilyName( GetFamilyName() ); if( bToBats ) @@ -482,7 +482,7 @@ sal_uInt16 SvxPostureItem::GetValueCount() const SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( (sal_uInt8)GetValue() ); + rStrm.WriteUChar( GetValue() ); return rStrm; } @@ -637,7 +637,7 @@ SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( (sal_uInt8)GetValue() ); + rStrm.WriteUChar( GetValue() ); return rStrm; } @@ -1258,7 +1258,7 @@ sal_uInt16 SvxTextLineItem::GetValueCount() const SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( (sal_uInt8)GetValue() ); + rStrm.WriteUChar( GetValue() ); return rStrm; } @@ -1476,7 +1476,7 @@ SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( (sal_uInt8)GetValue() ); + rStrm.WriteUChar( GetValue() ); return rStrm; } @@ -1563,7 +1563,7 @@ SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( (sal_uInt8) GetValue() ); + rStrm.WriteUChar( GetValue() ); return rStrm; } @@ -1612,7 +1612,7 @@ SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( (sal_uInt8) GetValue() ); + rStrm.WriteUChar( GetValue() ); return rStrm; } @@ -1982,7 +1982,7 @@ SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( (sal_uInt8)GetSOStoreTextEncoding(GetCharSet()) ); + rStrm.WriteUChar( GetSOStoreTextEncoding(GetCharSet()) ); WriteColor( rStrm, GetValue() ); return rStrm; } @@ -2141,7 +2141,7 @@ SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( (sal_uInt8) GetValue() ); + rStrm.WriteUChar( GetValue() ); return rStrm; } @@ -2270,7 +2270,7 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion* else if( DFLT_ESC_AUTO_SUB == _nEsc ) _nEsc = DFLT_ESC_SUB; } - rStrm.WriteUChar( (sal_uInt8) GetProp() ) + rStrm.WriteUChar( GetProp() ) .WriteInt16( (short) _nEsc ); return rStrm; } @@ -2652,7 +2652,7 @@ SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteUChar( (sal_uInt8) GetValue() ); + rStrm.WriteUChar( GetValue() ); return rStrm; } -- cgit