remove unnecessary casts in calls to SvStream.WriteUChar

left over from our conversion of the SvStream output operators
to more specific methods

Change-Id: I2ea4c7d97e745b3e6a3834f41ac7bfefa4883c7a

7 files changed, 34 insertions, 34 deletions

diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index f764fca14069..ade474752a08 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -423,7 +423,7 @@ void EMFWriter::ImplEndRecord()
         m_rStm.WriteUInt32( (sal_uInt32)( ( nActPos - mnRecordPos ) + nFillBytes ) );
         m_rStm.Seek( nActPos );
         while( nFillBytes-- )
-            m_rStm.WriteUChar( (sal_uInt8)0 );
+            m_rStm.WriteUChar( 0 );
         mnRecordCount++;
         mbRecordOpen = false;
     }
@@ -530,11 +530,11 @@ void EMFWriter::ImplCheckTextAttr()
         }
 
         m_rStm.WriteInt32( nWeight );
-        m_rStm.WriteUChar( (sal_uInt8) ( ( ITALIC_NONE == rFont.GetItalic() ) ? 0 : 1 ) );
-        m_rStm.WriteUChar( (sal_uInt8) ( ( UNDERLINE_NONE == rFont.GetUnderline() ) ? 0 : 1 ) );
-        m_rStm.WriteUChar( (sal_uInt8) ( ( STRIKEOUT_NONE == rFont.GetStrikeout() ) ? 0 : 1 ) );
-        m_rStm.WriteUChar( (sal_uInt8) ( ( RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet() ) ? 2 : 0 ) );
-        m_rStm.WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 );
+        m_rStm.WriteUChar( ( ( ITALIC_NONE == rFont.GetItalic() ) ? 0 : 1 ) );
+        m_rStm.WriteUChar( ( ( UNDERLINE_NONE == rFont.GetUnderline() ) ? 0 : 1 ) );
+        m_rStm.WriteUChar( ( ( STRIKEOUT_NONE == rFont.GetStrikeout() ) ? 0 : 1 ) );
+        m_rStm.WriteUChar( ( ( RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet() ) ? 2 : 0 ) );
+        m_rStm.WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 );
 
         switch( rFont.GetPitch() )
         {
@@ -576,7 +576,7 @@ void EMFWriter::ImplCheckTextAttr()
         m_rStm.WriteUInt32( (sal_uInt32) 0 );
 
         // dummy elfPanose
-        m_rStm.WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 );
+        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 );
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 164bfecb5f16..9389fdc63f66 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1191,8 +1191,8 @@ bool EnhWMFReader::ReadEnhWMF()
                             char* pBuf = new char[ nSize ];
                             SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
                             aTmp.ObjectOwnsMemory( true );
-                            aTmp.WriteUChar( (sal_uInt8)'B' )
-                                .WriteUChar( (sal_uInt8)'M' )
+                            aTmp.WriteUChar( 'B' )
+                                .WriteUChar( 'M' )
                                 .WriteUInt32( (sal_uInt32)cbBitsSrc )
                                 .WriteUInt16( (sal_uInt16)0 )
                                 .WriteUInt16( (sal_uInt16)0 )
@@ -1255,8 +1255,8 @@ bool EnhWMFReader::ReadEnhWMF()
                             char* pBuf = new char[ nSize ];
                             SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
                             aTmp.ObjectOwnsMemory( true );
-                            aTmp.WriteUChar( (sal_uInt8)'B' )
-                                .WriteUChar( (sal_uInt8)'M' )
+                            aTmp.WriteUChar( 'B' )
+                                .WriteUChar( 'M' )
                                 .WriteUInt32( (sal_uInt32)cbBitsSrc )
                                 .WriteUInt16( (sal_uInt16)0 )
                                 .WriteUInt16( (sal_uInt16)0 )
@@ -1325,8 +1325,8 @@ bool EnhWMFReader::ReadEnhWMF()
                             char* pBuf = new char[ nSize ];
                             SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
                             aTmp.ObjectOwnsMemory( true );
-                            aTmp.WriteUChar( (sal_uInt8)'B' )
-                               .WriteUChar( (sal_uInt8)'M' )
+                            aTmp.WriteUChar( 'B' )
+                               .WriteUChar( 'M' )
                                .WriteUInt32( (sal_uInt32)cbBitsSrc )
                                .WriteUInt16( (sal_uInt16)0 )
                                .WriteUInt16( (sal_uInt16)0 )
@@ -1565,8 +1565,8 @@ bool EnhWMFReader::ReadEnhWMF()
 
                                 SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
                                 aTmp.ObjectOwnsMemory( true );
-                                aTmp.WriteUChar( (sal_uInt8)'B' )
-                                    .WriteUChar( (sal_uInt8)'M' )
+                                aTmp.WriteUChar( 'B' )
+                                    .WriteUChar( 'M' )
                                     .WriteUInt32( (sal_uInt32)cbBits )
                                     .WriteUInt16( (sal_uInt16)0 )
                                     .WriteUInt16( (sal_uInt16)0 )
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 9e6c814da683..3e10281d8b83 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -246,7 +246,7 @@ void WMFWriter::WriteRectangle(const Rectangle & rRect)
 
 void WMFWriter::WriteColor(const Color & rColor)
 {
-    pWMF->WriteUChar( (sal_uInt8) rColor.GetRed() ).WriteUChar( (sal_uInt8) rColor.GetGreen() ).WriteUChar( (sal_uInt8) rColor.GetBlue() ).WriteUChar( (sal_uInt8) 0 );
+    pWMF->WriteUChar(  rColor.GetRed() ).WriteUChar( rColor.GetGreen() ).WriteUChar( rColor.GetBlue() ).WriteUChar( 0 );
 }
 
 void WMFWriter::WriteRecordHeader(sal_uInt32 nSizeWords, sal_uInt16 nType)
@@ -263,7 +263,7 @@ void WMFWriter::UpdateRecordHeader()
 
     nPos=pWMF->Tell(); nSize=nPos-nActRecordPos;
     if ((nSize & 1)!=0) {
-        pWMF->WriteUChar( (sal_uInt8)0 );
+        pWMF->WriteUChar( 0 );
         nPos++; nSize++;
     }
     nSize/=2;
@@ -326,9 +326,9 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const vcl::Font & rFont)
     }
     pWMF->WriteUInt16( nWeight );
 
-    if (rFont.GetItalic()==ITALIC_NONE)       pWMF->WriteUChar( (sal_uInt8)0 ); else  pWMF->WriteUChar( (sal_uInt8)1 );
-    if (rFont.GetUnderline()==UNDERLINE_NONE) pWMF->WriteUChar( (sal_uInt8)0 ); else  pWMF->WriteUChar( (sal_uInt8)1 );
-    if (rFont.GetStrikeout()==STRIKEOUT_NONE) pWMF->WriteUChar( (sal_uInt8)0 ); else  pWMF->WriteUChar( (sal_uInt8)1 );
+    if (rFont.GetItalic()==ITALIC_NONE)       pWMF->WriteUChar( 0 ); else  pWMF->WriteUChar( 1 );
+    if (rFont.GetUnderline()==UNDERLINE_NONE) pWMF->WriteUChar( 0 ); else  pWMF->WriteUChar( 1 );
+    if (rFont.GetStrikeout()==STRIKEOUT_NONE) pWMF->WriteUChar( 0 ); else  pWMF->WriteUChar( 1 );
 
     rtl_TextEncoding  eFontNameEncoding = rFont.GetCharSet();
     sal_uInt8         nCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontNameEncoding );
@@ -338,7 +338,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const vcl::Font & rFont)
         nCharSet = W_ANSI_CHARSET;
     pWMF->WriteUChar( nCharSet );
 
-    pWMF->WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 );
+    pWMF->WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 );
 
     switch (rFont.GetPitch()) {
         case PITCH_FIXED:    nPitchFamily=W_FIXED_PITCH;    break;
@@ -432,7 +432,7 @@ void WMFWriter::WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const sal_In
          .WriteUInt32( (sal_uInt32)nEsc );          // escape number
     pWMF->Write( pData, nLen );
     if ( nLen & 1 )
-        pWMF->WriteUChar( (sal_uInt8)0 );          // pad byte
+        pWMF->WriteUChar( 0 );          // pad byte
 }
 
 /* if return value is true, then a complete unicode string and also a polygon replacement has been written,
@@ -561,7 +561,7 @@ void WMFWriter::TrueExtTextOut( const Point& rPoint, const OUString& rString,
     pWMF->WriteUInt16( nNewTextLen ).WriteUInt16( (sal_uInt16)0 );
     write_uInt8s_FromOString(*pWMF, rByteString, nNewTextLen);
     if ( nNewTextLen & 1 )
-        pWMF->WriteUChar( (sal_uInt8)0 );
+        pWMF->WriteUChar( 0 );
 
     sal_Int32 nOriginalTextLen = rString.getLength();
     boost::scoped_array<sal_Int16> pConvertedDXAry(new sal_Int16[ nOriginalTextLen ]);
@@ -824,7 +824,7 @@ void WMFWriter::TrueTextOut(const Point & rPoint, const OString& rString)
 
     write_uInt16_lenPrefixed_uInt8s_FromOString(*pWMF, rString);
     sal_Int32 nLen = rString.getLength();
-    if ((nLen&1)!=0) pWMF->WriteUChar( (sal_uInt8)0 );
+    if ((nLen&1)!=0) pWMF->WriteUChar( 0 );
     WritePointYX(rPoint);
     UpdateRecordHeader();
 }
@@ -1678,7 +1678,7 @@ void WMFWriter::UpdateHeader()
     nPos=pWMF->Tell();                 // endposition = total size of file
     nFileSize=nPos-nMetafileHeaderPos; // subtract size of 1st header
     if ((nFileSize&1)!=0) {            // if needed round to words
-        pWMF->WriteUChar( (sal_uInt8)0 );
+        pWMF->WriteUChar( 0 );
         nPos++;
         nFileSize++;
     }
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 6236b0c55f53..f0a036c71906 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -722,7 +722,7 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation )
             WritePair( rOStm, rAnimation.maGlobalSize );
             rOStm.WriteUInt16( (sal_uInt16) ( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ) );
             rOStm.WriteUInt16( (sal_uInt16) rAnimBmp.eDisposal );
-            rOStm.WriteUChar( (sal_uInt8) rAnimBmp.bUserInput );
+            rOStm.WriteUChar( rAnimBmp.bUserInput );
             rOStm.WriteUInt32( (sal_uInt32) rAnimation.mnLoopCount );
             rOStm.WriteUInt32( nDummy32 ); // Unused
             rOStm.WriteUInt32( nDummy32 ); // Unused
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index e3dc7dc1aec3..54aa95652c56 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -370,16 +370,16 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol
 
                     if(rCandidate.HasFlags())
                     {
-                        rOStm.WriteUChar( (sal_uInt8)true );
+                        rOStm.WriteUChar( true );
 
                         for(sal_uInt16 c(0); c < nPointCount; c++)
                         {
-                            rOStm.WriteUChar( (sal_uInt8)rCandidate.GetFlags(c) );
+                            rOStm.WriteUChar( rCandidate.GetFlags(c) );
                         }
                     }
                     else
                     {
-                        rOStm.WriteUChar( (sal_uInt8)false );
+                        rOStm.WriteUChar( false );
                     }
                 }
             }
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 52708e71bc86..981926b3d248 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -983,8 +983,8 @@ bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, bool bRLE4 )
         rOStm.Write( pBuf.get(), nBufCount );
     }
 
-    rOStm.WriteUChar( (sal_uInt8) 0 );
-    rOStm.WriteUChar( (sal_uInt8) 1 );
+    rOStm.WriteUChar( 0 );
+    rOStm.WriteUChar( 1 );
 
     return( rOStm.GetError() == 0UL );
 }
@@ -1592,7 +1592,7 @@ bool WriteDIBBitmapEx(
     {
         rOStm.WriteUInt32( (sal_uInt32)0x25091962 );
         rOStm.WriteUInt32( (sal_uInt32)0xACB20201 );
-        rOStm.WriteUChar( (sal_uInt8)rSource.eTransparent );
+        rOStm.WriteUChar( rSource.eTransparent );
 
         if(TRANSPARENT_BITMAP == rSource.eTransparent)
         {
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index d556cdab11db..d2590a3348ef 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -722,10 +722,10 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font )
     rOStm.WriteUChar( rImpl_Font.mbWordLine );
     rOStm.WriteUChar( rImpl_Font.mbOutline );
     rOStm.WriteUChar( rImpl_Font.mbShadow );
-    rOStm.WriteUChar( (sal_uInt8) rImpl_Font.mnKerning );
+    rOStm.WriteUChar( rImpl_Font.mnKerning );
 
     // new in version 2
-    rOStm.WriteUChar( (sal_uInt8)        rImpl_Font.meRelief );
+    rOStm.WriteUChar(        rImpl_Font.meRelief );
     rOStm.WriteUInt16( (sal_uInt16)   rImpl_Font.maCJKLanguageTag.getLanguageType( false) );
     rOStm.WriteUChar( rImpl_Font.mbVertical );
     rOStm.WriteUInt16( (sal_uInt16)   rImpl_Font.meEmphasisMark );