diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-25 06:22:44 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-26 15:26:48 +0200 |
commit | dedfa972bc19f21e6fab7c38a64ae9543142f416 (patch) | |
tree | 9f568319c41402e901b8c7f4974203607135b6d8 /sd | |
parent | 8ea2bb252a8847b514546b7c49eeb7a83fcc7851 (diff) |
remove unnecessary casts in calls to SvStream.WriteInt16
left over from our conversion of the SvStream output operators
to more specific methods
Change-Id: Ie44bec6b988f3e46fe78d14b740818c9141f5df0
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 6 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 12 | ||||
-rw-r--r-- | sd/source/filter/eppt/escherex.cxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index ae0fda8c4800..31ea2d6e1deb 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -690,7 +690,7 @@ bool PPTWriter::ImplCreateDocument() mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, mpStrm->Tell() ); mpStrm->WriteUInt32( (sal_uInt32)0 ) // Reference to NotesMaster ( 0 if none ); .WriteUInt32( (sal_uInt32)0 ) // Reference to HandoutMaster ( 0 if none ); - .WriteInt16( (sal_Int16)1 ) // Number of the first slide; + .WriteInt16( 1 ) // Number of the first slide; .WriteUInt16( nSlideType ) // Size of the document slides ( default: EPP_SLIDESIZETYPEONSCREEN ) .WriteUChar( 0 ) // bool1 indicates if document was saved with embedded true type fonts .WriteUChar( 0 ) // bool1 indicates if the placeholders on the title slide are omitted @@ -1437,8 +1437,8 @@ bool PPTWriter::ImplWriteAtomEnding() .WriteUInt32( nPersistOfs ) // File offset to persist pointers for this save operation .WriteUInt32( (sal_uInt32)1 ) // Persist reference to the document persist object .WriteUInt32( (sal_uInt32)nPersistEntrys ) // max persists written, Seed value for persist object id management - .WriteInt16( (sal_Int16)EPP_LastViewTypeSlideView ) // last view type - .WriteInt16( (sal_Int16)0x12 ); // padword + .WriteInt16( EPP_LastViewTypeSlideView ) // last view type + .WriteInt16( 0x12 ); // padword return true; } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 254120f82999..30ec562f60e4 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -532,10 +532,10 @@ bool PPTWriter::ImplCloseDocument() mpStyleSheet->WriteTxCFStyleAtom( *mpStrm ); // create style that is used for new standard objects mpPptEscherEx->AddAtom( 10, EPP_TxSIStyleAtom ); mpStrm->WriteUInt32( (sal_uInt32)7 ) // ? - .WriteInt16( (sal_Int16)2 ) // ? + .WriteInt16( 2 ) // ? .WriteUChar( 9 ) // ? .WriteUChar( 8 ) // ? - .WriteInt16( (sal_Int16)0 ); // ? + .WriteInt16( 0 ); // ? mpStrm->Write( aTxMasterStyleAtomStrm.GetData(), aTxMasterStyleAtomStrm.Tell() ); maSoundCollection.Write( *mpStrm ); @@ -749,7 +749,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) if ( nPropertyFlags & 0x10 ) rOut.WriteUInt16( nFontId ); if ( nPropertyFlags & 0x40 ) - rOut.WriteInt16( (sal_Int16)nBuRealSize ); + rOut.WriteInt16( nBuRealSize ); if ( nPropertyFlags & 0x20 ) { sal_uInt32 nBulletColor = pPara->nBulletColor; @@ -2112,7 +2112,7 @@ bool PPTWriter::ImplCreatePresentationPlaceholder( const bool bMasterPage, const aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // oben, links, rechts, unten ???? + mpStrm->WriteInt16( maRect.Top() ).WriteInt16( maRect.Left() ).WriteInt16( maRect.Right() ).WriteInt16( maRect.Bottom() ); // oben, links, rechts, unten ???? mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); mpStrm->WriteUInt32( (sal_uInt32)0 ) // PlacementID @@ -2810,7 +2810,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt ); aPropertyOptions.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // top, left, right, bottom ???? + mpStrm->WriteInt16( maRect.Top() ).WriteInt16( maRect.Left() ).WriteInt16( maRect.Right() ).WriteInt16( maRect.Bottom() ); // top, left, right, bottom ???? mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); mpStrm->WriteUInt32( (sal_uInt32)0 ) // PlacementID @@ -2902,7 +2902,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt2 ); aPropOpt2.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // top, left, right, bottom ???? + mpStrm->WriteInt16( maRect.Top() ).WriteInt16( maRect.Left() ).WriteInt16( maRect.Right() ).WriteInt16( maRect.Bottom() ); // top, left, right, bottom ???? mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); sal_uInt8 PlaceHolderID = ( mType == "presentation.Subtitle") ? EPP_PLACEHOLDER_MASTERSUBTITLE:EPP_PLACEHOLDER_MASTERBODY; diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index 48b8b8a648ba..c2862793b36f 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -235,7 +235,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie { AddAtom( 8, ESCHER_ClientAnchor ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() ); - mpOutStrm->WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() ).WriteInt16( (sal_Int16)aRect.Right() ).WriteInt16( (sal_Int16)aRect.Bottom() ); + mpOutStrm->WriteInt16( aRect.Top() ).WriteInt16( aRect.Left() ).WriteInt16( aRect.Right() ).WriteInt16( aRect.Bottom() ); } else { |