diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-24 20:32:49 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-26 15:25:40 +0200 |
commit | 8f684e21de081350f0ce1f0bd0420f4775c5388d (patch) | |
tree | 66da106d499159a5ee1da6e6fdfe3b95a46d9a4e /sw | |
parent | ebdc36c12dbdd8bc2305adabf83c95c666f7b04f (diff) |
remove unnecessary static_cast's
left over from our conversion of the SvStream output operators
to more specific methods
e Please enter the commit message for your changes. Lines starting
Change-Id: Ibfe7635451ef7b8813d7a59c78c5223092a17ad5
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/tblafmt.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/laycache.cxx | 12 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/config/uinums.cxx | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 977dd406c37d..927ac9a23fc3 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -1212,7 +1212,7 @@ bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const m_pImpl->m_AutoFormats[0].GetBoxFmt(0).SaveVersionNo( rStream, AUTOFORMAT_FILE_VERSION); - rStream.WriteUInt16( static_cast<sal_uInt16>(m_pImpl->m_AutoFormats.size() - 1) ); + rStream.WriteUInt16( m_pImpl->m_AutoFormats.size() - 1 ); bRet = 0 == rStream.GetError(); for (sal_uInt16 i = 1; bRet && i < m_pImpl->m_AutoFormats.size(); ++i) diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index d35675e0a1f5..84d56ba21559 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -193,9 +193,9 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) aIo.OpenFlagRec( bFollow ? 0x01 : 0x00, bFollow ? 8 : 4 ); nNdIdx -= nStartOfContent; - aIo.GetStream().WriteUInt32( static_cast<sal_uInt32>(nNdIdx) ); + aIo.GetStream().WriteUInt32( nNdIdx ); if( bFollow ) - aIo.GetStream().WriteUInt32( static_cast<sal_uInt32>(((SwTxtFrm*)pTmp)->GetOfst()) ); + aIo.GetStream().WriteUInt32( ((SwTxtFrm*)pTmp)->GetOfst() ); aIo.CloseFlagRec(); /* Close Paragraph Record */ aIo.CloseRec( SW_LAYCACHE_IO_REC_PARA ); @@ -234,8 +234,8 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) aIo.OpenRec( SW_LAYCACHE_IO_REC_TABLE ); aIo.OpenFlagRec( 0, 8 ); nNdIdx -= nStartOfContent; - aIo.GetStream().WriteUInt32( static_cast<sal_uInt32>(nNdIdx) ) - .WriteUInt32( static_cast<sal_uInt32>(nOfst) ); + aIo.GetStream().WriteUInt32( nNdIdx ) + .WriteUInt32( nOfst ); aIo.CloseFlagRec(); /* Close Table Record */ aIo.CloseRec( SW_LAYCACHE_IO_REC_TABLE ); @@ -300,8 +300,8 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) sal_Int32 nY = rRct.Top() - pPage->Frm().Top(); aIo.GetStream().WriteUInt16( nPageNum ).WriteUInt32( nOrdNum ) .WriteInt32( nX ).WriteInt32( nY ) - .WriteInt32( static_cast<sal_Int32>(rRct.Width()) ) - .WriteInt32( static_cast<sal_Int32>(rRct.Height()) ); + .WriteInt32( rRct.Width() ) + .WriteInt32( rRct.Height() ); /* Close Fly Record */ aIo.CloseRec( SW_LAYCACHE_IO_REC_FLY ); } diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index fd009dfd4e4a..4afbf238620e 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2340,7 +2340,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) aPropOpt.Commit( *pStrm ); AddAtom( 4, ESCHER_ClientData ); - GetStream().WriteInt32( static_cast<sal_Int32>(1) ); + GetStream().WriteInt32( 1 ); CloseContainer(); // ESCHER_SpContainer } @@ -2809,10 +2809,10 @@ void SwEscherEx::WriteFrmExtraData( const SwFrmFmt& rFmt ) aWinwordAnchoring.WriteData(*this); AddAtom(4, ESCHER_ClientAnchor); - GetStream().WriteInt32( static_cast<sal_Int32>(0) ); + GetStream().WriteInt32( 0 ); AddAtom(4, ESCHER_ClientData); - GetStream().WriteInt32( static_cast<sal_Int32>(1) ); + GetStream().WriteInt32( 1 ); } sal_Int32 SwEscherEx::WriteFlyFrm(const DrawObj &rObj, sal_uInt32 &rShapeId, diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index d6e75319ff3d..afa6c6ab2ded 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1120,7 +1120,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, SvMemoryStream aMemStream; struct HyperLinksTable hlStr; sal_uInt16 mnRawRecId,mnRawRecSize; - aMemStream.WriteUInt16( sal_uInt16( 0 ) ).WriteUInt16( static_cast< sal_uInt16 >( nBufferSize ) ); + aMemStream.WriteUInt16( sal_uInt16( 0 ) ).WriteUInt16( nBufferSize ); // copy from DFF stream to memory stream ::std::vector< sal_uInt8 > aBuffer( nBufferSize ); diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx index 5daedfaeb299..57aefd9d47d5 100644 --- a/sw/source/uibase/config/uinums.cxx +++ b/sw/source/uibase/config/uinums.cxx @@ -483,7 +483,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) } rStream.WriteUInt16( nCharPoolId ); rStream.WriteUniOrByteString( sCharFmtName, eEncoding ); - rStream.WriteUInt16( static_cast<sal_uInt16>(aItems.size()) ); + rStream.WriteUInt16( aItems.size() ); for( sal_uInt16 n = aItems.size(); n; ) { |