summaryrefslogtreecommitdiff
path: root/sd/source/filter/eppt/escherex.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-25 20:19:30 +0200
committerNoel Grandin <noel@peralex.com>2014-09-26 15:27:17 +0200
commit5cefde06ea9f4347b5d2747e0d2825c3c710aa83 (patch)
tree7f24ac5f1fe1749ea8c0135c73de80745b1c7508 /sd/source/filter/eppt/escherex.cxx
parent04fd62096fca2c0b917ac6172104399e65933585 (diff)
remove unnecessary casts in calls to SvStream.WriteUInt32
left over from our conversion of the SvStream output operators to more specific methods Change-Id: I1d848f19f82783e6eabf2da37dbde78fe36ea1e0
Diffstat (limited to 'sd/source/filter/eppt/escherex.cxx')
-rw-r--r--sd/source/filter/eppt/escherex.cxx44
1 files changed, 22 insertions, 22 deletions
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index a796dd688daf..b2c36388eb94 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -34,8 +34,8 @@ sal_uInt32 PptEscherEx::DrawingGroupContainerSize()
void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt )
{
sal_uInt32 nSize = DrawingGroupContainerSize();
- rSt.WriteUInt32( (sal_uInt32)( 0xf | ( 1035 << 16 ) ) ) // EPP_PPDrawingGroup
- .WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ rSt.WriteUInt32( ( 0xf | ( 1035 << 16 ) ) ) // EPP_PPDrawingGroup
+ .WriteUInt32( ( nSize - 8 ) );
ImplWriteDggContainer( rSt );
}
@@ -57,8 +57,8 @@ void PptEscherEx::ImplWriteDggContainer( SvStream& rSt )
sal_uInt32 nSize = ImplDggContainerSize();
if ( nSize )
{
- rSt.WriteUInt32( (sal_uInt32)( 0xf | ( ESCHER_DggContainer << 16 ) ) )
- .WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ rSt.WriteUInt32( ( 0xf | ( ESCHER_DggContainer << 16 ) ) )
+ .WriteUInt32( ( nSize - 8 ) );
mxGlobal->SetDggContainer();
mxGlobal->WriteDggAtom( rSt );
@@ -83,14 +83,14 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt )
sal_uInt32 nSize = ImplOptAtomSize();
if ( nSize )
{
- rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 ) )
- .WriteUInt32( (sal_uInt32)( nSize - 8 ) )
- .WriteUInt16( ESCHER_Prop_fillColor ) .WriteUInt32( (sal_uInt32)0xffb800 )
- .WriteUInt16( ESCHER_Prop_fillBackColor ) .WriteUInt32( (sal_uInt32)0 )
- .WriteUInt16( ESCHER_Prop_fNoFillHitTest ) .WriteUInt32( (sal_uInt32)0x00100010 )
- .WriteUInt16( ESCHER_Prop_lineColor ) .WriteUInt32( (sal_uInt32)0x8000001 )
- .WriteUInt16( ESCHER_Prop_fNoLineDrawDash ) .WriteUInt32( (sal_uInt32)0x00080008 )
- .WriteUInt16( ESCHER_Prop_shadowColor ) .WriteUInt32( (sal_uInt32)0x8000002 );
+ rSt.WriteUInt32( ( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 ) )
+ .WriteUInt32( ( nSize - 8 ) )
+ .WriteUInt16( ESCHER_Prop_fillColor ) .WriteUInt32( 0xffb800 )
+ .WriteUInt16( ESCHER_Prop_fillBackColor ) .WriteUInt32( 0 )
+ .WriteUInt16( ESCHER_Prop_fNoFillHitTest ) .WriteUInt32( 0x00100010 )
+ .WriteUInt16( ESCHER_Prop_lineColor ) .WriteUInt32( 0x8000001 )
+ .WriteUInt16( ESCHER_Prop_fNoLineDrawDash ) .WriteUInt32( 0x00080008 )
+ .WriteUInt16( ESCHER_Prop_shadowColor ) .WriteUInt32( 0x8000002 );
}
}
@@ -109,12 +109,12 @@ void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt )
sal_uInt32 nSize = ImplSplitMenuColorsAtomSize();
if ( nSize )
{
- rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_SplitMenuColors << 16 ) | ( ESCHER_SPLIT_MENU_COLORS_COUNT << 4 ) ) )
- .WriteUInt32( (sal_uInt32)( nSize - 8 ) )
- .WriteUInt32( (sal_uInt32)0x08000004 )
- .WriteUInt32( (sal_uInt32)0x08000001 )
- .WriteUInt32( (sal_uInt32)0x08000002 )
- .WriteUInt32( (sal_uInt32)0x100000f7 );
+ rSt.WriteUInt32( ( ( ESCHER_SplitMenuColors << 16 ) | ( ESCHER_SPLIT_MENU_COLORS_COUNT << 4 ) ) )
+ .WriteUInt32( ( nSize - 8 ) )
+ .WriteUInt32( 0x08000004 )
+ .WriteUInt32( 0x08000001 )
+ .WriteUInt32( 0x08000002 )
+ .WriteUInt32( 0x100000f7 );
}
}
@@ -125,7 +125,7 @@ PptEscherEx::~PptEscherEx()
void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance )
{
- mpOutStrm->WriteUInt16( ( ( nRecInstance << 4 ) | 0xf ) ).WriteUInt16( n_EscherContainer ).WriteUInt32( (sal_uInt32)0 );
+ mpOutStrm->WriteUInt16( ( ( nRecInstance << 4 ) | 0xf ) ).WriteUInt16( n_EscherContainer ).WriteUInt32( 0 );
mOffsets.push_back( mpOutStrm->Tell() - 4 );
mRecTypes.push_back( n_EscherContainer );
@@ -139,8 +139,8 @@ void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance
mnCurrentDg = mxGlobal->GenerateDrawingId();
AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg );
PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() );
- mpOutStrm->WriteUInt32( (sal_uInt32)0 ) // The number of shapes in this drawing
- .WriteUInt32( (sal_uInt32)0 ); // The last MSOSPID given to an SP in this DG
+ mpOutStrm->WriteUInt32( 0 ) // The number of shapes in this drawing
+ .WriteUInt32( 0 ); // The last MSOSPID given to an SP in this DG
}
}
break;
@@ -253,7 +253,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
sal_uInt32 nSize = pClientData->Tell();
if ( nSize )
{
- mpOutStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) )
+ mpOutStrm->WriteUInt32( ( ( ESCHER_ClientData << 16 ) | 0xf ) )
.WriteUInt32( nSize );
mpOutStrm->Write( pClientData->GetData(), nSize );
}