diff options
26 files changed, 68 insertions, 68 deletions
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index f7458e251571..6dfaa383441b 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -376,7 +376,7 @@ bool SbxInfo::StoreData( SvStream& rStrm ) const RTL_TEXTENCODING_ASCII_US ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, RTL_TEXTENCODING_ASCII_US); - rStrm.WriteUInt32( nHelpId ).WriteUInt16( static_cast<sal_uInt16>(aParams.size()) ); + rStrm.WriteUInt32( nHelpId ).WriteUInt16( aParams.size() ); for(SbxParams::const_iterator i = aParams.begin(); i != aParams.end(); ++i) { write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, i->aName, diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index ed2be30b1fc8..cfa6a93d3362 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1181,14 +1181,14 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const // StyleName and Family... write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rC.GetStyle(), eEncoding); - rOStream.WriteUInt16( static_cast<sal_uInt16>(rC.GetFamily()) ); + rOStream.WriteUInt16( rC.GetFamily() ); // Paragraph attributes ... rC.GetParaAttribs().Store( rOStream ); // The number of attributes ... size_t nAttribs = rC.aAttribs.size(); - rOStream.WriteUInt16( static_cast<sal_uInt16>(nAttribs) ); + rOStream.WriteUInt16( nAttribs ); // And the individual attributes // Items as Surregate => always 8 bytes per Attribute diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 68eaf2c2993b..1ab78a7bec62 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -351,7 +351,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c if ( (nEnd-_nStart) > 0xFF00 ) rStrm.Seek( _nStart ); } - rStrm.WriteInt32( static_cast<sal_Int32>(nWidth) ); + rStrm.WriteInt32( nWidth ); rStrm.WriteUInt16( nStart ); rStrm.WriteUChar( nJustify ); rStrm.WriteChar( OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar() ); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 481e3939172d..1025185cdc96 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -109,7 +109,7 @@ namespace .WriteUInt16( l.GetDistance() ); if (version >= BORDER_LINE_WITH_STYLE_VERSION) - stream.WriteUInt16( static_cast<sal_uInt16>(l.GetBorderLineStyle()) ); + stream.WriteUInt16( l.GetBorderLineStyle() ); return stream; } @@ -709,8 +709,8 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con if( 0x80 & nAutoFirst ) { - rStrm.WriteInt32( static_cast<sal_Int32>(nLeftMargin) ); - rStrm.WriteInt32( static_cast<sal_Int32>(nRightMargin) ); + rStrm.WriteInt32( nLeftMargin ); + rStrm.WriteInt32( nRightMargin ); } } @@ -2180,7 +2180,7 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const const SvxBorderLine* l = pLine[ i ]; if( l ) { - rStrm.WriteSChar( static_cast<sal_Int8>(i) ); + rStrm.WriteSChar(i); StoreBorderLine(rStrm, *l, BorderLineVersionFromBoxVersion(nItemVersion)); } } diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 492c995eaeb1..5bc8fa1408f0 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -344,7 +344,7 @@ void TIFFWriter::ImplWritePalette() sal_uInt16 i; sal_uLong nCurrentPos = m_rOStm.Tell(); m_rOStm.Seek( mnPalPos + 8 ); // the palette tag entry needs the offset - m_rOStm.WriteUInt32( static_cast<sal_uInt32>(nCurrentPos - mnStreamOfs) ); // to the palette colors + m_rOStm.WriteUInt32( nCurrentPos - mnStreamOfs ); // to the palette colors m_rOStm.Seek( nCurrentPos ); for ( i = 0; i < mnColors; i++ ) @@ -374,7 +374,7 @@ bool TIFFWriter::ImplWriteBody() sal_uLong nGfxBegin = m_rOStm.Tell(); m_rOStm.Seek( mnBitmapPos + 8 ); // the strip offset tag entry needs the offset - m_rOStm.WriteUInt32( static_cast<sal_uInt32>(nGfxBegin - mnStreamOfs) ); // to the bitmap data + m_rOStm.WriteUInt32( nGfxBegin - mnStreamOfs ); // to the bitmap data m_rOStm.Seek( nGfxBegin ); StartCompression(); @@ -466,7 +466,7 @@ bool TIFFWriter::ImplWriteBody() { sal_uLong nGfxEnd = m_rOStm.Tell(); m_rOStm.Seek( mnStripByteCountPos + 8 ); - m_rOStm.WriteUInt32( static_cast<sal_uInt32>( nGfxEnd - nGfxBegin ) ); // mnStripByteCountPos needs the size of the compression data + m_rOStm.WriteUInt32( nGfxEnd - nGfxBegin ); // mnStripByteCountPos needs the size of the compression data m_rOStm.Seek( nGfxEnd ); } return mbStatus; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index fa5da9535c33..661b68d925fa 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4123,12 +4123,12 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject || pGraphicAttr->IsAdjusted() ) { SvMemoryStream aSt( sizeof( GraphicAttr ) ); - aSt.WriteUInt16( static_cast<sal_uInt16>(pGraphicAttr->GetDrawMode()) ) - .WriteUInt32( static_cast<sal_uInt32>(pGraphicAttr->GetMirrorFlags()) ) - .WriteInt32( static_cast<sal_Int32>(pGraphicAttr->GetLeftCrop()) ) - .WriteInt32( static_cast<sal_Int32>(pGraphicAttr->GetTopCrop()) ) - .WriteInt32( static_cast<sal_Int32>(pGraphicAttr->GetRightCrop()) ) - .WriteInt32( static_cast<sal_Int32>(pGraphicAttr->GetBottomCrop()) ) + aSt.WriteUInt16( pGraphicAttr->GetDrawMode() ) + .WriteUInt32( pGraphicAttr->GetMirrorFlags() ) + .WriteInt32( pGraphicAttr->GetLeftCrop() ) + .WriteInt32( pGraphicAttr->GetTopCrop() ) + .WriteInt32( pGraphicAttr->GetRightCrop() ) + .WriteInt32( pGraphicAttr->GetBottomCrop() ) .WriteUInt16( pGraphicAttr->GetRotation() ) .WriteInt16( pGraphicAttr->GetLuminance() ) .WriteInt16( pGraphicAttr->GetContrast() ) @@ -5019,7 +5019,7 @@ void EscherExGlobal::WriteDggAtom( SvStream& rStrm ) const sal_uInt32 nDggSize = GetDggAtomSize(); // write the DGG record header (do not include the 8 bytes of the header in the data size) - rStrm.WriteUInt32( static_cast< sal_uInt32 >( ESCHER_Dgg << 16 ) ).WriteUInt32( static_cast< sal_uInt32 >( nDggSize - 8 ) ); + rStrm.WriteUInt32( ESCHER_Dgg << 16 ).WriteUInt32( nDggSize - 8 ); // claculate and write the fixed DGG data sal_uInt32 nShapeCount = 0; diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx index 6d7a10ffd1e7..587d4168cac6 100644 --- a/sc/source/core/tool/rechead.cxx +++ b/sc/source/core/tool/rechead.cxx @@ -121,7 +121,7 @@ ScMultipleWriteHeader::~ScMultipleWriteHeader() sal_uLong nDataEnd = rStream.Tell(); rStream.WriteUInt16( (sal_uInt16) SCID_SIZES ); - rStream.WriteUInt32( static_cast<sal_uInt32>(aMemStream.Tell()) ); + rStream.WriteUInt32( aMemStream.Tell() ); rStream.Write( aMemStream.GetData(), aMemStream.Tell() ); if ( nDataEnd - nDataPos != nDataSize ) // matched default ? @@ -137,7 +137,7 @@ ScMultipleWriteHeader::~ScMultipleWriteHeader() void ScMultipleWriteHeader::EndEntry() { sal_uLong nPos = rStream.Tell(); - aMemStream.WriteUInt32( static_cast<sal_uInt32>(nPos - nEntryStart) ); + aMemStream.WriteUInt32( nPos - nEntryStart ); } void ScMultipleWriteHeader::StartEntry() diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index ff4dce6f59a0..4438ad3e3187 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3629,7 +3629,7 @@ OUString XclImpDffConverter::ReadHlinkProperty( SvStream& rDffStrm ) const { // create a faked BIFF record that can be read by XclImpStream class SvMemoryStream aMemStream; - 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/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index e8165a91fbe7..91278bb19057 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -1122,8 +1122,8 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr .WriteUInt16( aDateTime.Minutes ) .WriteUInt16( aDateTime.Seconds ) .WriteInt16( nMilliSeconds ) - .WriteInt32( static_cast< sal_Int32 >( aPoint.X() ) ) - .WriteInt32( static_cast< sal_Int32 >( aPoint.Y() ) ); + .WriteInt32( aPoint.X() ) + .WriteInt32( aPoint.Y() ); } } } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 8c0eb7fb2b2f..c7b60994db06 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -3865,15 +3865,15 @@ void TextObjBinary::WriteTextSpecInfo( SvStream* pStrm ) sal_Int32 nPortionSize = rPortion.mnTextSize >= nCharactersLeft ? nCharactersLeft : rPortion.mnTextSize; sal_Int32 nFlags = 7; nCharactersLeft -= nPortionSize; - pStrm ->WriteUInt32( static_cast< sal_uInt32 >( nPortionSize ) ) + pStrm ->WriteUInt32( nPortionSize ) .WriteInt32( nFlags ) - .WriteInt16( static_cast< sal_Int16 >( 1 ) ) // spellinfo -> needs rechecking - .WriteInt16( static_cast< sal_Int16 >( LanguageTag( rPortion.meCharLocale ).makeFallback().getLanguageType() ) ) - .WriteInt16( static_cast< sal_Int16 >( 0 ) ); // alt language + .WriteInt16( 1 ) // spellinfo -> needs rechecking + .WriteInt16( LanguageTag( rPortion.meCharLocale ).makeFallback().getLanguageType() ) + .WriteInt16( 0 ); // alt language } } if ( nCharactersLeft ) - pStrm->WriteUInt32( nCharactersLeft ).WriteInt32( static_cast< sal_Int32 >( 1 ) ).WriteInt16( static_cast< sal_Int16 >( 1 ) ); + pStrm->WriteUInt32( nCharactersLeft ).WriteInt32( 1 ).WriteInt16( 1 ); } } diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index a6c6a247650d..39aa8770343d 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -370,7 +370,7 @@ void SfxOleStringHelper::ImplSaveString16( SvStream& rStrm, const OUString& rVal rStrm.WriteInt32( nSize ); // write character array with trailing NUL character for( sal_Int32 nIdx = 0; nIdx < rValue.getLength(); ++nIdx ) - rStrm.WriteUInt16( static_cast< sal_uInt16 >( rValue[ nIdx ] ) ); + rStrm.WriteUInt16( rValue[ nIdx ] ); rStrm.WriteUInt16( sal_uInt16( 0 ) ); // stream is always padded to 32-bit boundary, add 2 bytes on odd character count if( (nSize & 1) == 1 ) @@ -483,7 +483,7 @@ void SfxOleBoolProperty::ImplLoad( SvStream& rStrm ) void SfxOleBoolProperty::ImplSave( SvStream& rStrm ) { - rStrm.WriteInt16( static_cast< sal_Int16 >( mbValue ? -1 : 0 ) ); + rStrm.WriteInt16( mbValue ? -1 : 0 ); } diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index e1291e26480b..7d8810b8ca34 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -393,7 +393,7 @@ SfxPoolItem * CntUInt32Item::Create(SvStream & rStream, sal_uInt16) const // virtual SvStream & CntUInt32Item::Store(SvStream &rStream, sal_uInt16) const { - rStream.WriteUInt32( static_cast<sal_uInt32>(m_nValue) ); + rStream.WriteUInt32( m_nValue ); return rStream; } diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx index 37d481ee7c8a..3e3060c266cf 100644 --- a/svl/source/numbers/numhead.cxx +++ b/svl/source/numbers/numhead.cxx @@ -119,7 +119,7 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader() sal_uLong nDataEnd = rStream.Tell(); rStream.WriteUInt16( (sal_uInt16) SV_NUMID_SIZES ); - rStream.WriteUInt32( static_cast<sal_uInt32>(aMemStream.Tell()) ); + rStream.WriteUInt32( aMemStream.Tell() ); rStream.Write( aMemStream.GetData(), aMemStream.Tell() ); if ( nDataEnd - nDataPos != nDataSize ) // Hit Default? @@ -137,7 +137,7 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader() void ImpSvNumMultipleWriteHeader::EndEntry() { sal_uLong nPos = rStream.Tell(); - aMemStream.WriteUInt32( static_cast<sal_uInt32>(nPos - nEntryStart) ); + aMemStream.WriteUInt32( nPos - nEntryStart ); } //#pragma SEG_FUNCDEF(numhead_0e) 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; ) { diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index d1571d95970f..01b753cf9f8a 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -102,11 +102,11 @@ sal_uIntPtr INetMessage::SetHeaderField ( SvStream& INetMessage::operator<< (SvStream& rStrm) const { - rStrm.WriteUInt32( static_cast<sal_uInt32>(m_nDocSize) ); + rStrm.WriteUInt32( m_nDocSize ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, m_aDocName, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = m_aHeaderList.size(); - rStrm.WriteUInt32( static_cast<sal_uInt32>(n) ); + rStrm.WriteUInt32( n ); for (i = 0; i < n; i++) WriteINetMessageHeader( rStrm, *( m_aHeaderList[ i ] ) ); @@ -611,7 +611,7 @@ SvStream& INetRFC822Message::operator<< (SvStream& rStrm) const INetMessage::operator<< (rStrm); for (sal_uInt16 i = 0; i < INETMSG_RFC822_NUMHDR; i++) - rStrm.WriteUInt32( static_cast<sal_uInt32>(m_nIndex[i]) ); + rStrm.WriteUInt32( m_nIndex[i] ); return rStrm; } @@ -1017,10 +1017,10 @@ SvStream& INetMIMEMessage::operator<< (SvStream& rStrm) const INetRFC822Message::operator<< (rStrm); for (sal_uInt16 i = 0; i < INETMSG_MIME_NUMHDR; i++) - rStrm.WriteUInt32( static_cast<sal_uInt32>(m_nIndex[i]) ); + rStrm.WriteUInt32( m_nIndex[i] ); write_uInt16_lenPrefixed_uInt8s_FromOString(rStrm, m_aBoundary); - rStrm.WriteUInt32( static_cast<sal_uInt32>(aChildren.size()) ); + rStrm.WriteUInt32( aChildren.size() ); return rStrm; } diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index b9144f3e7986..206f86e39960 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -657,10 +657,10 @@ void EMFWriter::ImplWriteRect( const Rectangle& rRect ) { const Rectangle aRect( OutputDevice::LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode )); m_rStm - .WriteInt32( static_cast<sal_Int32>(aRect.Left()) ) - .WriteInt32( static_cast<sal_Int32>(aRect.Top()) ) - .WriteInt32( static_cast<sal_Int32>(aRect.Right()) ) - .WriteInt32( static_cast<sal_Int32>(aRect.Bottom()) ); + .WriteInt32( aRect.Left() ) + .WriteInt32( aRect.Top() ) + .WriteInt32( aRect.Right() ) + .WriteInt32( aRect.Bottom() ); } void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, bool bClose ) diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 5d64ad9b8e8f..9e6c814da683 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -508,8 +508,8 @@ bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const OUString& r SvMemoryStream aMemoryStream( nStrmLen ); Point aPt( OutputDevice::LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode ) ); - aMemoryStream.WriteInt32( static_cast<sal_Int32>(aPt.X()) ) - .WriteInt32( static_cast<sal_Int32>(aPt.Y()) ) + aMemoryStream.WriteInt32( aPt.X() ) + .WriteInt32( aPt.Y() ) .WriteUInt32( nStringLen ); for ( i = 0; i < nStringLen; i++ ) aMemoryStream.WriteUInt16( rUniStr[ i ] ); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 8a3454ed2012..b9128669fd93 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -2385,7 +2385,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, // write data WritePair( rOStm, rStartPt ); - rOStm.WriteInt32( nWidth ).WriteUInt32( static_cast<sal_uInt32>(eStrikeout) ).WriteUInt32( static_cast<sal_uInt32>(eUnderline) ); + rOStm.WriteInt32( nWidth ).WriteUInt32( eStrikeout ).WriteUInt32( eUnderline ); rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment // calculate and write ActionSize of comment @@ -2437,7 +2437,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, default: { OStringBuffer aStr("Missing implementation for Action#: "); - aStr.append(static_cast<sal_Int32>(pAction->GetType())); + aStr.append(pAction->GetType()); aStr.append('!'); OSL_FAIL(aStr.getStr()); } diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 96fba1aa0985..8cfc4e49b2d8 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -129,7 +129,7 @@ SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass rOStm.WriteUInt16( nTmp ); rOStm.WriteDouble( rClass.mfMiterLimit ); - rOStm.WriteUInt32( static_cast<sal_uInt32>(rClass.maDashArray.size()) ); + rOStm.WriteUInt32( rClass.maDashArray.size() ); size_t i; for(i=0; i<rClass.maDashArray.size(); ++i) rOStm.WriteDouble( rClass.maDashArray[i] ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index c6b524b4243b..c572852d4c0f 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1548,10 +1548,10 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) //#fdo39428 SvStream no longer supports operator<<(long) WritePair( rOStm, maPos ); rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnWidth) ); - rOStm.WriteUInt32( static_cast<sal_uInt32>(meStrikeout) ); - rOStm.WriteUInt32( static_cast<sal_uInt32>(meUnderline) ); + rOStm.WriteUInt32( meStrikeout ); + rOStm.WriteUInt32( meUnderline ); // new in version 2 - rOStm.WriteUInt32( static_cast<sal_uInt32>(meOverline) ); + rOStm.WriteUInt32( meOverline ); } void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index a0e95d5f649d..028ab024e571 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -243,8 +243,8 @@ bool PNGWriterImpl::Write( SvStream& rOStm ) /* png signature is always an array of 8 bytes */ sal_uInt16 nOldMode = rOStm.GetNumberFormatInt(); rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); - rOStm.WriteUInt32( static_cast<sal_uInt32>(0x89504e47) ); - rOStm.WriteUInt32( static_cast<sal_uInt32>(0x0d0a1a0a) ); + rOStm.WriteUInt32( 0x89504e47 ); + rOStm.WriteUInt32( 0x0d0a1a0a ); std::vector< vcl::PNGWriter::ChunkData >::iterator aBeg( maChunkSeq.begin() ); std::vector< vcl::PNGWriter::ChunkData >::iterator aEnd( maChunkSeq.end() ); diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index adaa4b02013f..99c221540f99 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -264,8 +264,8 @@ void RegionBand::save(SvStream& rOStrm) const { // put boundaries rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_BANDHEADER ); - rOStrm.WriteInt32( static_cast<sal_Int32>(pBand->mnYTop) ); - rOStrm.WriteInt32( static_cast<sal_Int32>(pBand->mnYBottom) ); + rOStrm.WriteInt32( pBand->mnYTop ); + rOStrm.WriteInt32( pBand->mnYBottom ); // put separations of current band ImplRegionBandSep* pSep = pBand->mpFirstSep; @@ -274,8 +274,8 @@ void RegionBand::save(SvStream& rOStrm) const { // put separation rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_SEPARATION ); - rOStrm.WriteInt32( static_cast<sal_Int32>(pSep->mnXLeft) ); - rOStrm.WriteInt32( static_cast<sal_Int32>(pSep->mnXRight) ); + rOStrm.WriteInt32( pSep->mnXLeft ); + rOStrm.WriteInt32( pSep->mnXRight ); // next separation from current band pSep = pSep->mpNextSep; |