remove unnecessary casts in calls to SvStream.WriteUInt32

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

Change-Id: I1d848f19f82783e6eabf2da37dbde78fe36ea1e0

10 files changed, 80 insertions, 80 deletions

diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index 75310809d866..de866c4dac6d 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -159,7 +159,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream )
 
     sal_uInt32 nSizePos = aHeader.Tell();
 
-    aHeader.WriteUInt32( (sal_uInt32)0 );
+    aHeader.WriteUInt32( 0 );
 
     Rectangle aDocRect( 0, 0, static_cast<long>(mnDocWidth*mnDocXScale), static_cast<long>(mnDocHeight*mnDocYScale) );
 
@@ -174,7 +174,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream )
     const sal_uInt32 nSize = aHeader.Tell() + mpFontsStream->Tell() + mpMovieStream->Tell();
 
     aHeader.Seek( nSizePos );
-    aHeader.WriteUInt32( (sal_uInt32)nSize );
+    aHeader.WriteUInt32( nSize );
 
     ImplCopySvStreamToXOutputStream( aHeader, xOutStream );
     ImplCopySvStreamToXOutputStream( *mpFontsStream, xOutStream );
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 73c5c53d6bdc..07e2193174a8 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -377,8 +377,8 @@ void GIFWriter::WriteLogSizeExtension( const Size& rSize100 )
         m_rGIF.Write( "STARDIV 5.0", 11 );
         m_rGIF.WriteUChar( 0x09 );
         m_rGIF.WriteUChar( 0x01 );
-        m_rGIF.WriteUInt32( (sal_uInt32) rSize100.Width() );
-        m_rGIF.WriteUInt32( (sal_uInt32) rSize100.Height() );
+        m_rGIF.WriteUInt32( rSize100.Width() );
+        m_rGIF.WriteUInt32( rSize100.Height() );
         m_rGIF.WriteUChar( 0x00 );
     }
 }
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index d93246141aff..e6b7fc371c63 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -873,12 +873,12 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
     Size aUnitsPerDecimeter=OutputDevice::LogicToLogic(Size(10,10),MapMode(MAP_CM),aPictureMapMode);
     pMET->WriteUChar( 0xf6 ).WriteUChar( 0x28 ).WriteUChar( 0x40 ).WriteUChar( 0x00 )
          .WriteUChar( 0x05 ).WriteUChar( 0x01 )
-         .WriteUInt32( (sal_uInt32)(aUnitsPerDecimeter.Width()) )
-         .WriteUInt32( (sal_uInt32)(aUnitsPerDecimeter.Height()) )
-         .WriteUInt32( (sal_uInt32)0 )
-         .WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)aPictureRect.GetWidth() )
-         .WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)aPictureRect.GetHeight() )
-         .WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 );
+         .WriteUInt32( (aUnitsPerDecimeter.Width()) )
+         .WriteUInt32( (aUnitsPerDecimeter.Height()) )
+         .WriteUInt32( 0 )
+         .WriteUInt32( 0 ).WriteUInt32( aPictureRect.GetWidth() )
+         .WriteUInt32( 0 ).WriteUInt32( aPictureRect.GetHeight() )
+         .WriteUInt32( 0 ).WriteUInt32( 0 );
 
     //  0         0x21 Set Current Defaults
     //  1         Length of following data
@@ -905,8 +905,8 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
     //  6-n       M11, M12, M21, M22, M41, M42   Matrix elements
     pMET->WriteUChar( 0x21 ).WriteUChar( 0x1c ).WriteUChar( 0x07 ).WriteUChar( 0xcc )
          .WriteUChar( 0x0c ).WriteUChar( 0x8f )
-         .WriteUInt32( (sal_uInt32)0x00010000 ).WriteUInt32( (sal_uInt32)0x00000000 ).WriteUInt32( (sal_uInt32)0x00000000 )
-         .WriteUInt32( (sal_uInt32)0x00010000 ).WriteUInt32( (sal_uInt32)0x00000000 ).WriteUInt32( (sal_uInt32)0x00000000 );
+         .WriteUInt32( 0x00010000 ).WriteUInt32( 0x00000000 ).WriteUInt32( 0x00000000 )
+         .WriteUInt32( 0x00010000 ).WriteUInt32( 0x00000000 ).WriteUInt32( 0x00000000 );
 
     //  0         0x21 Set Current Defaults
     //  1         Length of following data
@@ -1157,9 +1157,9 @@ void METWriter::METBitBlt(Point aPt, Size aSize, const Size& rBmpSizePixel)
     pMET->WriteUChar( 0x02 ).WriteUChar( 0x00 ).WriteUChar( 0x00 ).WriteUChar( 0x00 );
     WritePoint(Point(aPt.X(),aPt.Y()+aSize.Height()));
     WritePoint(Point(aPt.X()+aSize.Width(),aPt.Y()));
-    pMET->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 )
-         .WriteUInt32( (sal_uInt32)(rBmpSizePixel.Width()) )
-         .WriteUInt32( (sal_uInt32)(rBmpSizePixel.Height()) );
+    pMET->WriteUInt32( 0 ).WriteUInt32( 0 )
+         .WriteUInt32( (rBmpSizePixel.Width()) )
+         .WriteUInt32( (rBmpSizePixel.Height()) );
 }
 
 void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo )
@@ -1212,7 +1212,7 @@ void METWriter::METPopLineInfo( const LineInfo& rLineInfo )
            .WriteUChar( 6 )
            .WriteUChar( 0 )             // Flags
            .WriteUChar( 0 )
-           .WriteUInt32( (sal_uInt32)1 );
+           .WriteUInt32( 1 );
 
     if ( rLineInfo.GetStyle() != LINE_SOLID )
     {
@@ -2374,7 +2374,7 @@ void METWriter::WriteObjectEnvironmentGroup(const GDIMetaFile * pMTF)
         pMET->WriteUChar( 0x0c ).WriteUChar( 0x02 ).WriteUChar( 0x84 ).WriteUChar( 0x00 );
         WriteFieldId(nId);
         pMET->WriteUChar( 0x07 ).WriteUChar( 0x22 ).WriteUChar( 0x10 );
-        pMET->WriteUInt32( (sal_uInt32)nId );
+        pMET->WriteUInt32( nId );
         nId++;
     }
 
@@ -2412,10 +2412,10 @@ void METWriter::WriteGraphicsObject(const GDIMetaFile * pMTF)
     nNumberOfDataFields++;
 
     // now at first we write the head of the segment:
-    pMET->WriteUChar( 0x70 ).WriteUChar( 0x0e ).WriteUInt32( (sal_uInt32)0 );
+    pMET->WriteUChar( 0x70 ).WriteUChar( 0x0e ).WriteUInt32( 0 );
     pMET->WriteUChar( 0x70 ).WriteUChar( 0x10 ); // Flags
     pMET->WriteUInt16( 0 ); // Lo-Word of the length of the segment data  (Big Endian)
-    pMET->WriteUInt32( (sal_uInt32)0 );  // Reserved
+    pMET->WriteUInt32( 0 );  // Reserved
     pMET->WriteUInt16( 0 ); // Hi-Word of the length of the segment (Big Endian) (Ohh Ohh OS2)
     // Annotation: we're writing the correct data length again below
 
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index e429966df865..559cddd91cf1 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -904,7 +904,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
         nDstRowBytes = nWidth * 4;
 
         // writing Opcode and BaseAddr (?):
-        pPict->WriteUInt16( 0x009a ).WriteUInt32( (sal_uInt32)0x000000ff );
+        pPict->WriteUInt16( 0x009a ).WriteUInt32( 0x000000ff );
 
         // Normally we want to produce packing type 4 (run length encoding
         // for 32-bit pixels). But if RowBytes<8 is true, generally all data is
@@ -924,16 +924,16 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
               .WriteUInt16( nWidth )                // X2-position of the bitmap in the source
               .WriteUInt16( 0x0000 )                // Version
               .WriteUInt16( nPackType )             // Packing type
-              .WriteUInt32( (sal_uInt32) 0x00000000 )            // Packing size (?)
-              .WriteUInt32( (sal_uInt32) 0x00480000 )            // H-Res
-              .WriteUInt32( (sal_uInt32) 0x00480000 )            // V-Res
+              .WriteUInt32( 0x00000000 )            // Packing size (?)
+              .WriteUInt32( 0x00480000 )            // H-Res
+              .WriteUInt32( 0x00480000 )            // V-Res
               .WriteUInt16( 0x0010 )                // Pixel type (?)
               .WriteUInt16( 0x0020 )                // Pixel size: 32 bit
               .WriteUInt16( 0x0004 )                // CmpCount: 4 components
               .WriteUInt16( 0x0008 )                // CmpSize: 8 bits
-              .WriteUInt32( (sal_uInt32) 0x00000000 )            // PlaneBytes (?)
-              .WriteUInt32( (sal_uInt32) 0x00000000 )            // (?)
-              .WriteUInt32( (sal_uInt32) 0x00000000 );           // (?)
+              .WriteUInt32( 0x00000000 )            // PlaneBytes (?)
+              .WriteUInt32( 0x00000000 )            // (?)
+              .WriteUInt32( 0x00000000 );           // (?)
 
         // Source-Rectangle schreiben:
         pPict->WriteUInt16( 0x0000 )                // Y1-position on the bitmap
@@ -1108,20 +1108,20 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
               .WriteUInt16( nWidth )                // X2-position of the bitmap in the source
               .WriteUInt16( 0x0000 )                // Version
               .WriteUInt16( nPackType )             // Packing type
-              .WriteUInt32( (sal_uInt32) 0x00000000 )            // Packing size (?)
-              .WriteUInt32( (sal_uInt32) 0x00480000 )            // H-Res
-              .WriteUInt32( (sal_uInt32) 0x00480000 )            // V-Res
+              .WriteUInt32( 0x00000000 )            // Packing size (?)
+              .WriteUInt32( 0x00480000 )            // H-Res
+              .WriteUInt32( 0x00480000 )            // V-Res
               .WriteUInt16( 0x0000 )                // Pixel type (?)
               .WriteUInt16( nBitsPerPixel )         // Pixel size
               .WriteUInt16( 0x0001 )                // CmpCount: 1 component
               .WriteUInt16( nBitsPerPixel )         // CmpSize
-              .WriteUInt32( (sal_uInt32) 0x00000000 )            // PlaneBytes (?)
-              .WriteUInt32( (sal_uInt32) 0x00000000 )            // (?)
-              .WriteUInt32( (sal_uInt32) 0x00000000 );           // (?)
+              .WriteUInt32( 0x00000000 )            // PlaneBytes (?)
+              .WriteUInt32( 0x00000000 )            // (?)
+              .WriteUInt32( 0x00000000 );           // (?)
 
         // writing and reading the palette:
         nColTabSize = pAcc->GetPaletteEntryCount();
-        pPict->WriteUInt32( (sal_uInt32)0 ).WriteUInt16( 0x8000 ).WriteUInt16( ( nColTabSize - 1 ) );
+        pPict->WriteUInt32( 0 ).WriteUInt16( 0x8000 ).WriteUInt16( ( nColTabSize - 1 ) );
 
         for ( i = 0; i < nColTabSize; i++ )
         {
@@ -2140,7 +2140,7 @@ void PictWriter::WriteHeader(const GDIMetaFile & rMTF)
     Rectangle   aRect( aPoint, aSize );
 
     // 512 Bytes "trash" at the beginning:
-    for (i=0;i<128;i++) pPict->WriteUInt32( (sal_uInt32)0 );
+    for (i=0;i<128;i++) pPict->WriteUInt32( 0 );
 
     // Lo-16-Bits of the file size without the 512 bytes trash:
     pPict->WriteUInt16( 0 ); // gets corrected later on by UpdateHeader()
@@ -2149,16 +2149,16 @@ void PictWriter::WriteHeader(const GDIMetaFile & rMTF)
     WriteRectangle( aRect );
 
     // Version 2:
-    pPict->WriteUInt32( (sal_uInt32)0x001102ff );
+    pPict->WriteUInt32( 0x001102ff );
 
     // Extended-Version-2-Header:
     pPict->WriteUInt16( 0x0c00 )                            // Opcode
           .WriteUInt16( 0xfffe )                            // Version (?)
           .WriteUInt16( 0x0000 )                            // Reserved
-          .WriteUInt32( (sal_uInt32) 0x00480000 )                        // hRes
-          .WriteUInt32( (sal_uInt32) 0x00480000 );
+          .WriteUInt32( 0x00480000 )                        // hRes
+          .WriteUInt32( 0x00480000 );
     WriteRectangle( aRect );
-    pPict->WriteUInt32( (sal_uInt32)0x00000000 );                        // Reserved
+    pPict->WriteUInt32( 0x00000000 );                        // Reserved
 
     // many import filters demand the declaration
     // of a clipping area at the beginning
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 6ad502568636..52b52892ed9b 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -375,10 +375,10 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
 
     if ( mnPreview & EPS_PREVIEW_TIFF )
     {
-        rTargetStream.WriteUInt32( (sal_uInt32)0xC6D3D0C5 );
+        rTargetStream.WriteUInt32( 0xC6D3D0C5 );
         nStreamPosition = rTargetStream.Tell();
-        rTargetStream.WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 )
-           .WriteUInt32( nStreamPosition + 26 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt16( 0xffff );
+        rTargetStream.WriteUInt32( 0 ).WriteUInt32( 0 ).WriteUInt32( 0 ).WriteUInt32( 0 )
+           .WriteUInt32( nStreamPosition + 26 ).WriteUInt32( 0 ).WriteUInt16( 0xffff );
 
         sal_uInt32 nErrCode;
         if ( mbGrayScale )
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index 8b230668faf5..2bf66dbf1bca 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -148,17 +148,17 @@ bool RASWriter::ImplWriteHeader()
     }
         if ( mbStatus && mnWidth && mnHeight && mnDepth )
     {
-        m_rOStm.WriteUInt32( (sal_uInt32)0x59a66a95 ).WriteUInt32( (sal_uInt32)mnWidth ).WriteUInt32( (sal_uInt32)mnHeight )
-           .WriteUInt32( (sal_uInt32)mnDepth )
-           .WriteUInt32( (sal_uInt32)(( ( ( ( mnWidth * mnDepth ) + 15 ) >> 4 ) << 1 ) * mnHeight) )
-           .WriteUInt32( (sal_uInt32)2 );
+        m_rOStm.WriteUInt32( 0x59a66a95 ).WriteUInt32( mnWidth ).WriteUInt32( mnHeight )
+           .WriteUInt32( mnDepth )
+           .WriteUInt32( (( ( ( ( mnWidth * mnDepth ) + 15 ) >> 4 ) << 1 ) * mnHeight) )
+           .WriteUInt32( 2 );
 
         if ( mnDepth > 8 )
-            m_rOStm.WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 );
+            m_rOStm.WriteUInt32( 0 ).WriteUInt32( 0 );
         else
         {
 
-            m_rOStm.WriteUInt32( (sal_uInt32)1 ).WriteUInt32( (sal_uInt32)( mnColors * 3 ) );
+            m_rOStm.WriteUInt32( 1 ).WriteUInt32( ( mnColors * 3 ) );
         }
     }
     else mbStatus = false;
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 7e0c4354548c..8d9cc0f406ce 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -177,9 +177,9 @@ bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterCo
     // we will use the BIG Endian Mode
     // TIFF header
     m_rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-    m_rOStm.WriteUInt32( (sal_uInt32)0x4d4d002a );      // TIFF identifier
+    m_rOStm.WriteUInt32( 0x4d4d002a );      // TIFF identifier
     mnLatestIfdPos = m_rOStm.Tell();
-    m_rOStm.WriteUInt32( (sal_uInt32)0 );
+    m_rOStm.WriteUInt32( 0 );
 
     Animation   aAnimation;
     Bitmap      aBmp;
@@ -274,7 +274,7 @@ bool TIFFWriter::ImplWriteHeader( bool bMultiPage )
     {
         sal_uInt32 nCurrentPos = m_rOStm.Tell();
         m_rOStm.Seek( mnLatestIfdPos );
-        m_rOStm.WriteUInt32( (sal_uInt32)( nCurrentPos - mnStreamOfs ) );   // offset to the IFD
+        m_rOStm.WriteUInt32( ( nCurrentPos - mnStreamOfs ) );   // offset to the IFD
         m_rOStm.Seek( nCurrentPos );
 
         // (OFS8) TIFF image file directory (IFD)
@@ -329,7 +329,7 @@ bool TIFFWriter::ImplWriteHeader( bool bMultiPage )
 
         // and last we write zero to close the num dir entries list
         mnLatestIfdPos = m_rOStm.Tell();
-        m_rOStm.WriteUInt32( (sal_uInt32)0 );               // there are no more IFD
+        m_rOStm.WriteUInt32( 0 );               // there are no more IFD
     }
     else
         mbStatus = false;
@@ -478,9 +478,9 @@ void TIFFWriter::ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResoluti
 {
     sal_uLong nCurrentPos = m_rOStm.Tell();
     m_rOStm.Seek( nStreamPos + 8 );
-    m_rOStm.WriteUInt32( (sal_uInt32)nCurrentPos - mnStreamOfs );
+    m_rOStm.WriteUInt32( nCurrentPos - mnStreamOfs );
     m_rOStm.Seek( nCurrentPos );
-    m_rOStm.WriteUInt32( (sal_uInt32)1 );
+    m_rOStm.WriteUInt32( 1 );
     m_rOStm.WriteUInt32( nResolutionUnit );
 }
 
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 37258d7bf838..d79aad38072f 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2210,10 +2210,10 @@ void OS2METReader::ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen)
                     return;
                 }
                 // write (Windows-)BITMAPINFOHEADER:
-                (p->pBMP)->WriteUInt32( (sal_uInt32)40 ).WriteUInt32( p->nWidth ).WriteUInt32( p->nHeight );
+                (p->pBMP)->WriteUInt32( 40 ).WriteUInt32( p->nWidth ).WriteUInt32( p->nHeight );
                 (p->pBMP)->WriteUInt16( 1 ).WriteUInt16( p->nBitsPerPixel );
-                (p->pBMP)->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 );
-                (p->pBMP)->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 );
+                (p->pBMP)->WriteUInt32( 0 ).WriteUInt32( 0 ).WriteUInt32( 0 ).WriteUInt32( 0 );
+                (p->pBMP)->WriteUInt32( 0 ).WriteUInt32( 0 );
                 // write color table:
                 if (p->nBitsPerPixel<=8) {
                     sal_uInt16 i, nColTabSize=1<<(p->nBitsPerPixel);
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 522e9b669775..cac923aacc8f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -100,7 +100,7 @@ using namespace ::com::sun::star;
 EscherExContainer::EscherExContainer( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance ) :
     rStrm   ( rSt )
 {
-    rStrm.WriteUInt32( (sal_uInt32)( ( 0xf | ( nInstance << 4 ) ) | ( nRecType << 16 ) ) ).WriteUInt32( (sal_uInt32)0 );
+    rStrm.WriteUInt32( ( ( 0xf | ( nInstance << 4 ) ) | ( nRecType << 16 ) ) ).WriteUInt32( 0 );
     nContPos = rStrm.Tell();
 }
 EscherExContainer::~EscherExContainer()
@@ -118,7 +118,7 @@ EscherExContainer::~EscherExContainer()
 EscherExAtom::EscherExAtom( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance, const sal_uInt8 nVersion ) :
     rStrm   ( rSt )
 {
-    rStrm.WriteUInt32( (sal_uInt32)( ( nVersion | ( nInstance << 4 ) ) | ( nRecType << 16 ) ) ).WriteUInt32( (sal_uInt32)0 );
+    rStrm.WriteUInt32( ( ( nVersion | ( nInstance << 4 ) ) | ( nRecType << 16 ) ) ).WriteUInt32( 0 );
     nContPos = rStrm.Tell();
 }
 EscherExAtom::~EscherExAtom()
@@ -4164,8 +4164,8 @@ void EscherBlibEntry::WriteBlibEntry( SvStream& rSt, bool bWritePictureOffset, s
 {
     sal_uInt32  nPictureOffset = ( bWritePictureOffset ) ? mnPictureOffset : 0;
 
-    rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_BSE << 16 ) | ( ( (sal_uInt16)meBlibType << 4 ) | 2 ) ) )
-       .WriteUInt32( (sal_uInt32)( 36 + nResize ) )
+    rSt.WriteUInt32( ( ( ESCHER_BSE << 16 ) | ( ( (sal_uInt16)meBlibType << 4 ) | 2 ) ) )
+       .WriteUInt32( ( 36 + nResize ) )
        .WriteUChar( meBlibType );
 
     switch ( meBlibType )
@@ -4180,10 +4180,10 @@ void EscherBlibEntry::WriteBlibEntry( SvStream& rSt, bool bWritePictureOffset, s
 
     rSt.Write( &mnIdentifier[ 0 ], 16 );
     rSt.WriteUInt16( 0 )
-       .WriteUInt32( (sal_uInt32)( mnSize + mnSizeExtra ) )
+       .WriteUInt32( ( mnSize + mnSizeExtra ) )
        .WriteUInt32( mnRefCount )
        .WriteUInt32( nPictureOffset )
-       .WriteUInt32( (sal_uInt32)0 );
+       .WriteUInt32( 0 );
 }
 
 EscherBlibEntry::~EscherBlibEntry()
@@ -4265,8 +4265,8 @@ void EscherGraphicProvider::WriteBlibStoreContainer( SvStream& rSt, SvStream* pM
     sal_uInt32  nSize = GetBlibStoreContainerSize( pMergePicStreamBSE );
     if ( nSize )
     {
-        rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_BstoreContainer << 16 ) | 0x1f ) )
-           .WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+        rSt.WriteUInt32( ( ( ESCHER_BstoreContainer << 16 ) | 0x1f ) )
+           .WriteUInt32( ( nSize - 8 ) );
 
         if ( pMergePicStreamBSE )
         {
@@ -4458,8 +4458,8 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
 
             if ( mnFlags & _E_GRAPH_PROV_USE_INSTANCES )
             {
-                rPicOutStrm.WriteUInt32( (sal_uInt32)( 0x7f90000 | (sal_uInt16)( mnBlibEntrys << 4 ) ) )
-                           .WriteUInt32( (sal_uInt32)0 );
+                rPicOutStrm.WriteUInt32( ( 0x7f90000 | (sal_uInt16)( mnBlibEntrys << 4 ) ) )
+                           .WriteUInt32( 0 );
                 nAtomSize = rPicOutStrm.Tell();
                  if ( eBlibType == PNG )
                     rPicOutStrm.WriteUInt16( 0x0606 );
@@ -4498,7 +4498,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
                 //nInstance = ( eBlibType == PNG ) ? 0xf01e6e00 : 0xf01d46a0;
 
 
-                rPicOutStrm.WriteUInt32( nInstance ).WriteUInt32( (sal_uInt32)( p_EscherBlibEntry->mnSize + nExtra ) );
+                rPicOutStrm.WriteUInt32( nInstance ).WriteUInt32( ( p_EscherBlibEntry->mnSize + nExtra ) );
                 rPicOutStrm.Write( p_EscherBlibEntry->mnIdentifier, 16 );
                 rPicOutStrm.WriteUChar( 0xff );
                 rPicOutStrm.Write( pGraphicAry, p_EscherBlibEntry->mnSize );
@@ -4518,7 +4518,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
                     nExtra = eBlibType == WMF ? 0x42 : 0x32;                                    // !EMF -> no change
                     p_EscherBlibEntry->mnSizeExtra = nExtra + 8;
                     nInstance = ( eBlibType == WMF ) ? 0xf01b2170 : 0xf01a3d40;                 // !EMF -> no change
-                    rPicOutStrm.WriteUInt32( nInstance ).WriteUInt32( (sal_uInt32)( p_EscherBlibEntry->mnSize + nExtra ) );
+                    rPicOutStrm.WriteUInt32( nInstance ).WriteUInt32( ( p_EscherBlibEntry->mnSize + nExtra ) );
                     if ( eBlibType == WMF )                                                     // !EMF -> no change
                         rPicOutStrm.Write( p_EscherBlibEntry->mnIdentifier, 16 );
                     rPicOutStrm.Write( p_EscherBlibEntry->mnIdentifier, 16 );
@@ -4564,7 +4564,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
             {
                 sal_uInt32  nPos = rPicOutStrm.Tell();
                 rPicOutStrm.Seek( nAtomSize - 4 );
-                rPicOutStrm.WriteUInt32( (sal_uInt32)( nPos - nAtomSize ) );
+                rPicOutStrm.WriteUInt32( ( nPos - nAtomSize ) );
                 rPicOutStrm.Seek( nPos );
             }
             nBlibId = ImplInsertBlib( p_EscherBlibEntry ), p_EscherBlibEntry = NULL;
@@ -4889,7 +4889,7 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm )
         sal_uInt32  nRecHdPos, nCurrentPos, nSize;
         rStrm  .WriteUInt16( ( ( nCount << 4 ) | 0xf ) )    // open an ESCHER_SolverContainer
                .WriteUInt16( ESCHER_SolverContainer )
-               .WriteUInt32( (sal_uInt32)0 );
+               .WriteUInt32( 0 );
 
         nRecHdPos = rStrm.Tell() - 4;
 
@@ -4910,8 +4910,8 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm )
                 if ( aConnectorRule.nShapeB )
                     aConnectorRule.ncptiB = pPtr->GetConnectorRule( false );
             }
-            rStrm  .WriteUInt32( (sal_uInt32)( ( ESCHER_ConnectorRule << 16 ) | 1 ) )   // atom hd
-                   .WriteUInt32( (sal_uInt32)24 )
+            rStrm  .WriteUInt32( ( ( ESCHER_ConnectorRule << 16 ) | 1 ) )   // atom hd
+                   .WriteUInt32( 24 )
                    .WriteUInt32( aConnectorRule.nRuleId )
                    .WriteUInt32( aConnectorRule.nShapeA )
                    .WriteUInt32( aConnectorRule.nShapeB )
@@ -5162,7 +5162,7 @@ void EscherEx::InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom )
         if ( (nCurPos < nEndOfRecord) || ((nCurPos == nEndOfRecord) && (bContainer || bExpandEndOfAtom)) )
         {
             mpOutStrm->SeekRel( -4 );
-            mpOutStrm->WriteUInt32( (sal_uInt32)( nSize + nBytes ) );
+            mpOutStrm->WriteUInt32( ( nSize + nBytes ) );
             if ( !bContainer )
                 mpOutStrm->SeekRel( nSize );
         }
@@ -5244,7 +5244,7 @@ bool EscherEx::InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue )
 
 void EscherEx::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance )
 {
-    mpOutStrm->WriteUInt16( ( ( nRecInstance << 4 ) | 0xf  ) ).WriteUInt16( nEscherContainer ).WriteUInt32( (sal_uInt32)0 );
+    mpOutStrm->WriteUInt16( ( ( nRecInstance << 4 ) | 0xf  ) ).WriteUInt16( nEscherContainer ).WriteUInt32( 0 );
     mOffsets.push_back( mpOutStrm->Tell() - 4 );
     mRecTypes.push_back( nEscherContainer );
     switch( nEscherContainer )
@@ -5272,8 +5272,8 @@ void EscherEx::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance )
                     mnCurrentDg = mxGlobal->GenerateDrawingId();
                     AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg );
                     PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() );
-                    mpOutStrm->WriteUInt32( (sal_uInt32)0 )     // The number of shapes in this drawing
-                              .WriteUInt32( (sal_uInt32)0 );    // The last MSOSPID given to an SP in this DG
+                    mpOutStrm->WriteUInt32( 0 )     // The number of shapes in this drawing
+                              .WriteUInt32( 0 );    // The last MSOSPID given to an SP in this DG
                 }
             }
         }
@@ -5339,7 +5339,7 @@ void EscherEx::CloseContainer()
 void EscherEx::BeginAtom()
 {
     mnCountOfs = mpOutStrm->Tell();
-    mpOutStrm->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 );       // record header wird spaeter geschrieben
+    mpOutStrm->WriteUInt32( 0 ).WriteUInt32( 0 );       // record header wird spaeter geschrieben
 }
 
 void EscherEx::EndAtom( sal_uInt16 nRecType, int nRecVersion, int nRecInstance )
@@ -5347,7 +5347,7 @@ void EscherEx::EndAtom( sal_uInt16 nRecType, int nRecVersion, int nRecInstance )
     sal_uInt32  nOldPos = mpOutStrm->Tell();
     mpOutStrm->Seek( mnCountOfs );
     sal_uInt32 nSize = nOldPos - mnCountOfs;
-    mpOutStrm->WriteUInt16( ( ( nRecInstance << 4 ) | ( nRecVersion & 0xf ) ) ).WriteUInt16( nRecType ).WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+    mpOutStrm->WriteUInt16( ( ( nRecInstance << 4 ) | ( nRecVersion & 0xf ) ) ).WriteUInt16( nRecType ).WriteUInt32( ( nSize - 8 ) );
     mpOutStrm->Seek( nOldPos );
 }
 
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9811a746f2ee..c2962de8e0a7 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -157,7 +157,7 @@ void Impl_OlePres::Write( SvStream & rStm )
     rStm.WriteInt32( (nJobLen +4) );       // a TargetDevice that's always empty
     if( nJobLen )
         rStm.Write( pJob, nJobLen );
-    rStm.WriteUInt32( (sal_uInt32)nAspect );
+    rStm.WriteUInt32( nAspect );
     rStm.WriteInt32( -1 );      //L-Index always -1
     rStm.WriteInt32( nAdvFlags );
     rStm.WriteInt32( 0 );       //Compression
@@ -196,7 +196,7 @@ void Impl_OlePres::Write( SvStream & rStm )
     }
     sal_uLong nEndPos = rStm.Tell();
     rStm.Seek( nPos );
-    rStm.WriteUInt32( (sal_uInt32)(nEndPos - nPos - 4) );
+    rStm.WriteUInt32( (nEndPos - nPos - 4) );
     rStm.Seek( nEndPos );
 }