diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-25 17:56:24 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-26 15:26:48 +0200 |
commit | 5501c8d2220ee3cab703d09d348e99ba3e017dba (patch) | |
tree | ce59b08fa7ad1192f3038266db1be0d64a05c0c3 /vcl | |
parent | dedfa972bc19f21e6fab7c38a64ae9543142f416 (diff) |
remove unnecessary casts in calls to SvStream.WriteUInt16
left over from our conversion of the SvStream output operators
to more specific methods
Change-Id: I482ca7abb84613971e7e8f839f7aa67a65cd71ff
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/filter/wmf/emfwr.cxx | 18 | ||||
-rw-r--r-- | vcl/source/filter/wmf/enhwmf.cxx | 16 | ||||
-rw-r--r-- | vcl/source/filter/wmf/wmfwr.cxx | 38 | ||||
-rw-r--r-- | vcl/source/gdi/animate.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/cvtsvm.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/dibtools.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/font.cxx | 24 | ||||
-rw-r--r-- | vcl/source/gdi/gfxlink.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/gradient.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/hatch.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/lineinfo.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/mapmod.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/metaact.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/region.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/regionband.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/wall.cxx | 2 |
16 files changed, 68 insertions, 68 deletions
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index ee0780879ab6..3a0972cea067 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -182,7 +182,7 @@ void EMFWriter::ImplBeginPlusRecord( sal_uInt16 nType, sal_uInt16 nFlags ) mbRecordPlusOpen = true; mnRecordPlusPos = m_rStm.Tell(); - m_rStm.WriteUInt16( (sal_uInt16) nType ).WriteUInt16( (sal_uInt16) nFlags ); + m_rStm.WriteUInt16( nType ).WriteUInt16( nFlags ); m_rStm.SeekRel( 8 ); } } @@ -266,7 +266,7 @@ void EMFWriter::ImplWritePlusPoint( const Point& rPoint ) { // Convert to pixels const Point aPoint(maVDev.LogicToPixel( rPoint, maDestMapMode )); - m_rStm.WriteUInt16( (sal_uInt16) aPoint.X() ).WriteUInt16( (sal_uInt16) aPoint.Y() ); + m_rStm.WriteUInt16( aPoint.X() ).WriteUInt16( aPoint.Y() ); } void EMFWriter::ImplWritePlusFillPolygonRecord( const Polygon& rPoly, const sal_uInt32& nTrans ) @@ -357,7 +357,7 @@ bool EMFWriter::WriteEMF(const GDIMetaFile& rMtf) .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) ( aMtfSizePix.Width() - 1 ) ).WriteInt32( (sal_Int32) ( aMtfSizePix.Height() - 1 ) ) .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() - 1 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() - 1 ) ) .WriteUInt32( (sal_uInt32) 0x464d4520 ).WriteUInt32( (sal_uInt32) 0x10000 ).WriteUInt32( (sal_uInt32) ( nEndPos - nHeaderPos ) ) - .WriteUInt32( (sal_uInt32) mnRecordCount ).WriteUInt16( (sal_uInt16) ( mnHandleCount + 1 ) ).WriteUInt16( (sal_uInt16) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ) + .WriteUInt32( (sal_uInt32) mnRecordCount ).WriteUInt16( ( mnHandleCount + 1 ) ).WriteUInt16( 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ) .WriteInt32( (sal_Int32) aMtfSizePix.Width() ).WriteInt32( (sal_Int32) aMtfSizePix.Height() ) .WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() / 100 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() / 100 ) ) .WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ) @@ -556,15 +556,15 @@ void EMFWriter::ImplCheckTextAttr() m_rStm.WriteUChar( nPitchAndFamily ); for( i = 0; i < 32; i++ ) - m_rStm.WriteUInt16( (sal_Unicode) ( ( i < aFontName.getLength() ) ? aFontName[ i ] : 0 ) ); + m_rStm.WriteUInt16( ( ( i < aFontName.getLength() ) ? aFontName[ i ] : 0 ) ); // dummy elfFullName for( i = 0; i < 64; i++ ) - m_rStm.WriteUInt16( (sal_Unicode) 0 ); + m_rStm.WriteUInt16( 0 ); // dummy elfStyle for( i = 0; i < 32; i++ ) - m_rStm.WriteUInt16( (sal_Unicode) 0 ); + m_rStm.WriteUInt16( 0 ); // dummy elfVersion, elfStyleSize, elfMatch, elfReserved m_rStm.WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ) ; @@ -579,7 +579,7 @@ void EMFWriter::ImplCheckTextAttr() m_rStm.WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ); // fill record to get a record size divideable by 4 - m_rStm.WriteUInt16( (sal_uInt16) 0 ); + m_rStm.WriteUInt16( 0 ); ImplEndRecord(); @@ -919,11 +919,11 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const OUString& rText, c // write text for( i = 0; i < nLen; i++ ) - m_rStm.WriteUInt16( (sal_Unicode)rText[ i ] ); + m_rStm.WriteUInt16( rText[ i ] ); // padding word if( nLen & 1 ) - m_rStm.WriteUInt16( (sal_uInt16) 0 ); + m_rStm.WriteUInt16( 0 ); // write DX array ImplWriteExtent( pDX[ 0 ] ); diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 9389fdc63f66..aced348b7bea 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -1194,8 +1194,8 @@ bool EnhWMFReader::ReadEnhWMF() aTmp.WriteUChar( 'B' ) .WriteUChar( 'M' ) .WriteUInt32( (sal_uInt32)cbBitsSrc ) - .WriteUInt16( (sal_uInt16)0 ) - .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( 0 ) + .WriteUInt16( 0 ) .WriteUInt32( (sal_uInt32)cbBmiSrc + 14 ); pWMF->Seek( nStart + offBmiSrc ); pWMF->Read( pBuf + 14, cbBmiSrc ); @@ -1258,8 +1258,8 @@ bool EnhWMFReader::ReadEnhWMF() aTmp.WriteUChar( 'B' ) .WriteUChar( 'M' ) .WriteUInt32( (sal_uInt32)cbBitsSrc ) - .WriteUInt16( (sal_uInt16)0 ) - .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( 0 ) + .WriteUInt16( 0 ) .WriteUInt32( (sal_uInt32)cbBmiSrc + 14 ); pWMF->Seek( nStart + offBmiSrc ); pWMF->Read( pBuf + 14, cbBmiSrc ); @@ -1328,8 +1328,8 @@ bool EnhWMFReader::ReadEnhWMF() aTmp.WriteUChar( 'B' ) .WriteUChar( 'M' ) .WriteUInt32( (sal_uInt32)cbBitsSrc ) - .WriteUInt16( (sal_uInt16)0 ) - .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( 0 ) + .WriteUInt16( 0 ) .WriteUInt32( (sal_uInt32)cbBmiSrc + 14 ); pWMF->Seek( nStart + offBmiSrc ); pWMF->Read( pBuf + 14, cbBmiSrc ); @@ -1568,8 +1568,8 @@ bool EnhWMFReader::ReadEnhWMF() aTmp.WriteUChar( 'B' ) .WriteUChar( 'M' ) .WriteUInt32( (sal_uInt32)cbBits ) - .WriteUInt16( (sal_uInt16)0 ) - .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( 0 ) + .WriteUInt16( 0 ) .WriteUInt32( (sal_uInt32)cbBmi + 14 ); pWMF->Seek( nStart + offBmi ); pWMF->Read( pBuf + 14, cbBmi ); diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index b93eeca47b86..1fa62da67618 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -294,12 +294,12 @@ void WMFWriter::WMFRecord_CreateBrushIndirect(const Color& rColor) WriteRecordHeader(0x00000007,W_META_CREATEBRUSHINDIRECT); if( rColor==Color(COL_TRANSPARENT) ) - pWMF->WriteUInt16( (sal_uInt16) W_BS_HOLLOW ); + pWMF->WriteUInt16( W_BS_HOLLOW ); else - pWMF->WriteUInt16( (sal_uInt16) W_BS_SOLID ); + pWMF->WriteUInt16( W_BS_SOLID ); WriteColor( rColor ); - pWMF->WriteUInt16( (sal_uInt16) 0 ); + pWMF->WriteUInt16( 0 ); } void WMFWriter::WMFRecord_CreateFontIndirect(const vcl::Font & rFont) @@ -424,9 +424,9 @@ void WMFWriter::WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const sal_In nCheckSum = rtl_crc32( nCheckSum, pData, nLen ); WriteRecordHeader( 3 + 9 + ( ( nLen + 1 ) >> 1 ), W_META_ESCAPE ); - pWMF->WriteUInt16( (sal_uInt16)W_MFCOMMENT ) - .WriteUInt16( (sal_uInt16)( nLen + 14 ) ) // we will always have a fourteen byte escape header: - .WriteUInt16( (sal_uInt16)0x4f4f ) // OO + pWMF->WriteUInt16( W_MFCOMMENT ) + .WriteUInt16( ( nLen + 14 ) ) // we will always have a fourteen byte escape header: + .WriteUInt16( 0x4f4f ) // OO .WriteUInt32( (sal_uInt32)0xa2c2a ) // evil magic number .WriteUInt32( (sal_uInt32)nCheckSum ) // crc32 checksum about nEsc & pData .WriteUInt32( (sal_uInt32)nEsc ); // escape number @@ -558,7 +558,7 @@ void WMFWriter::TrueExtTextOut( const Point& rPoint, const OUString& rString, WriteRecordHeader( 0, W_META_EXTTEXTOUT ); WritePointYX( rPoint ); sal_uInt16 nNewTextLen = static_cast<sal_uInt16>(rByteString.getLength()); - pWMF->WriteUInt16( nNewTextLen ).WriteUInt16( (sal_uInt16)0 ); + pWMF->WriteUInt16( nNewTextLen ).WriteUInt16( 0 ); write_uInt8s_FromOString(*pWMF, rByteString, nNewTextLen); if ( nNewTextLen & 1 ) pWMF->WriteUChar( 0 ); @@ -581,7 +581,7 @@ void WMFWriter::TrueExtTextOut( const Point& rPoint, const OUString& rString, OString aTemp(&nUniChar, 1, aSrcFont.GetCharSet()); j = aTemp.getLength(); while ( --j > 0 ) - pWMF->WriteUInt16( (sal_uInt16)0 ); + pWMF->WriteUInt16( 0 ); } } pConvertedDXAry.reset(); @@ -655,7 +655,7 @@ void WMFWriter::WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly) } WriteRecordHeader(0,W_META_POLYPOLYGON); pWMF->WriteUInt16( nCount ); - for (i=0; i<nCount; i++) pWMF->WriteUInt16( (sal_uInt16)(aSimplePolyPoly.GetObject(i).GetSize()) ); + for (i=0; i<nCount; i++) pWMF->WriteUInt16( (aSimplePolyPoly.GetObject(i).GetSize()) ); for (i=0; i<nCount; i++) { pPoly=&(aSimplePolyPoly.GetObject(i)); nSize=pPoly->GetSize(); @@ -697,14 +697,14 @@ void WMFWriter::WMFRecord_SelectObject(sal_uInt16 nObjectHandle) void WMFWriter::WMFRecord_SetBkMode(bool bTransparent) { WriteRecordHeader(0x00000004,W_META_SETBKMODE); - if (bTransparent) pWMF->WriteUInt16( (sal_uInt16)W_TRANSPARENT ); - else pWMF->WriteUInt16( (sal_uInt16)W_OPAQUE ); + if (bTransparent) pWMF->WriteUInt16( W_TRANSPARENT ); + else pWMF->WriteUInt16( W_OPAQUE ); } void WMFWriter::WMFRecord_SetStretchBltMode() { WriteRecordHeader( 0x00000004, W_META_SETSTRETCHBLTMODE ); - pWMF->WriteUInt16( (sal_uInt16) 3 ); // STRETCH_DELETESCANS + pWMF->WriteUInt16( 3 ); // STRETCH_DELETESCANS } void WMFWriter::WMFRecord_SetPixel(const Point & rPoint, const Color & rColor) @@ -1661,13 +1661,13 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable ) } nMetafileHeaderPos=pWMF->Tell(); - pWMF->WriteUInt16( (sal_uInt16)0x0001 ) // type: file - .WriteUInt16( (sal_uInt16)0x0009 ) // header length in words - .WriteUInt16( (sal_uInt16)0x0300 ) // Version as BCD number + pWMF->WriteUInt16( 0x0001 ) // type: file + .WriteUInt16( 0x0009 ) // header length in words + .WriteUInt16( 0x0300 ) // Version as BCD number .WriteUInt32( (sal_uInt32) 0x00000000 ) // file length (without 1st header), is later corrected by UpdateHeader() - .WriteUInt16( (sal_uInt16)MAXOBJECTHANDLES ) // maxmimum number of simultaneous objects + .WriteUInt16( MAXOBJECTHANDLES ) // maxmimum number of simultaneous objects .WriteUInt32( (sal_uInt32) 0x00000000 ) // maximum record length, is later corrected by UpdateHeader() - .WriteUInt16( (sal_uInt16)0x0000 ); // reserved + .WriteUInt16( 0x0000 ); // reserved } void WMFWriter::UpdateHeader() @@ -1891,8 +1891,8 @@ void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sa { // according to http://msdn.microsoft.com/en-us/library/dd366152%28PROT.13%29.aspx WriteRecordHeader( 0, W_META_ESCAPE ); - pWMF->WriteUInt16( (sal_uInt16)W_MFCOMMENT ) // same as META_ESCAPE_ENHANCED_METAFILE - .WriteUInt16( (sal_uInt16)( nCurSize + 34 ) ) // we will always have a 34 byte escape header: + pWMF->WriteUInt16( W_MFCOMMENT ) // same as META_ESCAPE_ENHANCED_METAFILE + .WriteUInt16( ( nCurSize + 34 ) ) // we will always have a 34 byte escape header: .WriteUInt32( (sal_uInt32) 0x43464D57 ) // WMFC .WriteUInt32( (sal_uInt32) 0x00000001 ) // Comment type .WriteUInt32( (sal_uInt32) 0x00010000 ) // version diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index f0a036c71906..86f66d73c837 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -720,8 +720,8 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation ) WritePair( rOStm, rAnimBmp.aPosPix ); WritePair( rOStm, rAnimBmp.aSizePix ); WritePair( rOStm, rAnimation.maGlobalSize ); - rOStm.WriteUInt16( (sal_uInt16) ( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ) ); - rOStm.WriteUInt16( (sal_uInt16) rAnimBmp.eDisposal ); + rOStm.WriteUInt16( ( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ) ); + rOStm.WriteUInt16( rAnimBmp.eDisposal ); rOStm.WriteUChar( rAnimBmp.bUserInput ); rOStm.WriteUInt32( (sal_uInt32) rAnimation.mnLoopCount ); rOStm.WriteUInt32( nDummy32 ); // Unused diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index d916ed9767e6..f622ddf8a9f1 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -352,7 +352,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol nAllFlagCount); // Flags themselves rOStm.WriteInt32( nActionSize ); - rOStm.WriteUInt16( (sal_uInt16)nAllPolygonCount ); + rOStm.WriteUInt16( nAllPolygonCount ); for(a = 0; a < nPolygonCount; a++) { diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 981926b3d248..92a91b65c53e 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -1363,10 +1363,10 @@ bool ImplWriteDIBFileHeader(SvStream& rOStm, BitmapReadAccess& rAcc, bool bUseDI const sal_uInt32 nPalCount((rAcc.HasPalette() ? rAcc.GetPaletteEntryCount() : isBitfieldCompression(rAcc.GetScanlineFormat()) ? 3UL : 0UL)); const sal_uInt32 nOffset(14 + (bUseDIBV5 ? DIBV5HEADERSIZE : DIBINFOHEADERSIZE) + nPalCount * 4UL); - rOStm.WriteUInt16( (sal_uInt16)0x4D42 ); // 'MB' from BITMAPFILEHEADER + rOStm.WriteUInt16( 0x4D42 ); // 'MB' from BITMAPFILEHEADER rOStm.WriteUInt32( (sal_uInt32)(nOffset + (rAcc.Height() * rAcc.GetScanlineSize())) ); - rOStm.WriteUInt16( (sal_uInt16)0 ); - rOStm.WriteUInt16( (sal_uInt16)0 ); + rOStm.WriteUInt16( 0 ); + rOStm.WriteUInt16( 0 ); rOStm.WriteUInt32( nOffset ); return( rOStm.GetError() == 0UL ); diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index d2590a3348ef..269527e848ec 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -707,15 +707,15 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font ) rOStm.WriteUniOrByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() ); WritePair( rOStm, rImpl_Font.maSize ); - rOStm.WriteUInt16( (sal_uInt16) GetStoreCharSet( rImpl_Font.meCharSet ) ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meFamily ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.mePitch ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meWeight ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meUnderline ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meStrikeout ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meItalic ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.maLanguageTag.getLanguageType( false) ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meWidthType ); + rOStm.WriteUInt16( GetStoreCharSet( rImpl_Font.meCharSet ) ); + rOStm.WriteUInt16( rImpl_Font.meFamily ); + rOStm.WriteUInt16( rImpl_Font.mePitch ); + rOStm.WriteUInt16( rImpl_Font.meWeight ); + rOStm.WriteUInt16( rImpl_Font.meUnderline ); + rOStm.WriteUInt16( rImpl_Font.meStrikeout ); + rOStm.WriteUInt16( rImpl_Font.meItalic ); + rOStm.WriteUInt16( rImpl_Font.maLanguageTag.getLanguageType( false) ); + rOStm.WriteUInt16( rImpl_Font.meWidthType ); rOStm.WriteInt16( rImpl_Font.mnOrientation ); @@ -726,12 +726,12 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font ) // new in version 2 rOStm.WriteUChar( rImpl_Font.meRelief ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.maCJKLanguageTag.getLanguageType( false) ); + rOStm.WriteUInt16( rImpl_Font.maCJKLanguageTag.getLanguageType( false) ); rOStm.WriteUChar( rImpl_Font.mbVertical ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meEmphasisMark ); + rOStm.WriteUInt16( rImpl_Font.meEmphasisMark ); // new in version 3 - rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meOverline ); + rOStm.WriteUInt16( rImpl_Font.meOverline ); return rOStm; } diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 934022a2f398..03de2ed86374 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -254,7 +254,7 @@ SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink ) VersionCompat* pCompat = new VersionCompat( rOStream, STREAM_WRITE, 2 ); // Version 1 - rOStream.WriteUInt16( (sal_uInt16) rGfxLink.GetType() ).WriteUInt32( rGfxLink.GetDataSize() ).WriteUInt32( rGfxLink.GetUserId() ); + rOStream.WriteUInt16( rGfxLink.GetType() ).WriteUInt32( rGfxLink.GetDataSize() ).WriteUInt32( rGfxLink.GetUserId() ); // Version 2 WritePair( rOStream, rGfxLink.GetPrefSize() ); diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx index 6b40529d8506..04fcea7a7c81 100644 --- a/vcl/source/gdi/gradient.cxx +++ b/vcl/source/gdi/gradient.cxx @@ -303,7 +303,7 @@ SvStream& WriteImpl_Gradient( SvStream& rOStm, const Impl_Gradient& rImpl_Gradie { VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); - rOStm.WriteUInt16( (sal_uInt16) rImpl_Gradient.meStyle ); + rOStm.WriteUInt16( rImpl_Gradient.meStyle ); WriteColor( rOStm, rImpl_Gradient.maStartColor ); WriteColor( rOStm, rImpl_Gradient.maEndColor ); rOStm.WriteUInt16( rImpl_Gradient.mnAngle ) diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index baa669d44030..8a131cd8e2db 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -135,7 +135,7 @@ SvStream& WriteImplHatch( SvStream& rOStm, const ImplHatch& rImplHatch ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); - rOStm.WriteUInt16( (sal_uInt16) rImplHatch.meStyle ); + rOStm.WriteUInt16( rImplHatch.meStyle ); WriteColor( rOStm, rImplHatch.maColor ); rOStm.WriteInt32( rImplHatch.mnDistance ).WriteUInt16( rImplHatch.mnAngle ); diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 74158ad80507..d7ae97aa7d82 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -229,7 +229,7 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo VersionCompat aCompat( rOStm, STREAM_WRITE, 4 ); // version 1 - rOStm.WriteUInt16( (sal_uInt16) rImplLineInfo.meStyle ).WriteInt32( rImplLineInfo.mnWidth ); + rOStm.WriteUInt16( rImplLineInfo.meStyle ).WriteInt32( rImplLineInfo.mnWidth ); // since version2 rOStm.WriteUInt16( rImplLineInfo.mnDashCount ).WriteInt32( rImplLineInfo.mnDashLen ); @@ -237,10 +237,10 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo rOStm.WriteInt32( rImplLineInfo.mnDistance ); // since version3 - rOStm.WriteUInt16( (sal_uInt16) rImplLineInfo.meLineJoin ); + rOStm.WriteUInt16( rImplLineInfo.meLineJoin ); // since version4 - rOStm.WriteUInt16( (sal_uInt16) rImplLineInfo.meLineCap ); + rOStm.WriteUInt16( rImplLineInfo.meLineCap ); return rOStm; } diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index f48230a225a9..992898e0164e 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -60,7 +60,7 @@ SvStream& WriteImplMapMode( SvStream& rOStm, const ImplMapMode& rImplMapMode ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); - rOStm.WriteUInt16( (sal_uInt16) rImplMapMode.meUnit ); + rOStm.WriteUInt16( rImplMapMode.meUnit ); WritePair( rOStm, rImplMapMode.maOrigin ); WriteFraction( rOStm, rImplMapMode.maScaleX ); WriteFraction( rOStm, rImplMapMode.maScaleY ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 3715034b0a2a..faefe4b1e4ab 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -2979,7 +2979,7 @@ void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, STREAM_WRITE, 1); - rOStm.WriteUInt16( (sal_uInt16) maAlign ); + rOStm.WriteUInt16( maAlign ); } void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) @@ -3216,7 +3216,7 @@ void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, STREAM_WRITE, 1); - rOStm.WriteUInt16( (sal_uInt16) meRasterOp ); + rOStm.WriteUInt16( meRasterOp ); } void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 49ba57e0dad6..6e9d528ba5ef 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1642,7 +1642,7 @@ SvStream& WriteRegion( SvStream& rOStrm, const Region& rRegion ) aRegionType = REGION_RECTANGLE; } - rOStrm.WriteUInt16( (sal_uInt16)aRegionType ); + rOStrm.WriteUInt16( aRegionType ); // get RegionBand const RegionBand* pRegionBand = rRegion.getRegionBand(); diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 99c221540f99..a7d109f72dd7 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -263,7 +263,7 @@ void RegionBand::save(SvStream& rOStrm) const while(pBand) { // put boundaries - rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_BANDHEADER ); + rOStrm.WriteUInt16( STREAMENTRY_BANDHEADER ); rOStrm.WriteInt32( pBand->mnYTop ); rOStrm.WriteInt32( pBand->mnYBottom ); @@ -273,7 +273,7 @@ void RegionBand::save(SvStream& rOStrm) const while(pSep) { // put separation - rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_SEPARATION ); + rOStrm.WriteUInt16( STREAMENTRY_SEPARATION ); rOStrm.WriteInt32( pSep->mnXLeft ); rOStrm.WriteInt32( pSep->mnXRight ); @@ -285,7 +285,7 @@ void RegionBand::save(SvStream& rOStrm) const } // put endmarker - rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_END ); + rOStrm.WriteUInt16( STREAMENTRY_END ); } bool RegionBand::isSingleRectangle() const diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index 8891165fc966..00031a3c829d 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -148,7 +148,7 @@ SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpap // version 1 WriteColor( rOStm, rImplWallpaper.maColor ); - rOStm.WriteUInt16( (sal_uInt16) rImplWallpaper.meStyle ); + rOStm.WriteUInt16( rImplWallpaper.meStyle ); // version 2 rOStm.WriteUChar( bRect ).WriteUChar( bGrad ).WriteUChar( bBmp ).WriteUChar( bDummy ).WriteUChar( bDummy ).WriteUChar( bDummy ); |