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

10 files changed, 94 insertions, 94 deletions

diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 31ea2d6e1deb..856a65cdb320 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -180,7 +180,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
     mpStrm->WriteUInt32( (sal_uInt32)(nMasterNum | 0x80000000) )// master ID (equals 0x80000000 on a master page)
            .WriteUInt32( (sal_uInt32)nPageNum + 0x100 )         // notes ID (equals null if no notes are present)
            .WriteUInt16( nMode )
-           .WriteUInt16( (sal_uInt16)0 );                       // padword
+           .WriteUInt16( 0 );                       // padword
 
     mnDiaMode = 0;
     bool bVisible = true;
@@ -346,8 +346,8 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
             mpStrm->WriteUInt32( (sal_uInt32)0x5f005f )
                    .WriteUInt32( (sal_uInt32)0x50005f )
                    .WriteUInt32( (sal_uInt32)0x540050 )
-                   .WriteUInt16( (sal_uInt16)0x31 )
-                   .WriteUInt16( (sal_uInt16)0x30 );
+                   .WriteUInt16( 0x31 )
+                   .WriteUInt16( 0x30 );
         }
         {
             EscherExAtom aBinaryTagData( *mpStrm, EPP_BinaryTagData );
@@ -366,8 +366,8 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
            .WriteUChar( 1 ).WriteUChar( 2 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 )     // placeholderID
            .WriteUInt32( (sal_uInt32)0 )        // master ID (equals null at a master page)
            .WriteUInt32( (sal_uInt32)0 )        // notes ID (equals null if no notes are present)
-           .WriteUInt16( (sal_uInt16)0 )        // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
-           .WriteUInt16( (sal_uInt16)0 );       // padword
+           .WriteUInt16( 0 )        // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
+           .WriteUInt16( 0 );       // padword
 
     mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
     mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 );
@@ -400,7 +400,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
         bool bFirst = true;
         bool bSimpleText = false;
 
-        mpStrm->WriteUInt16( (sal_uInt16)5 );                           // paragraph count
+        mpStrm->WriteUInt16( 5 );                           // paragraph count
 
         for ( sal_uInt16 nLev = 0; nLev < 5; nLev++ )
         {
@@ -471,17 +471,17 @@ bool PPTWriter::ImplCreateCurrentUserStream()
     sal_uInt32 nLenOfUserName = strlen( pUserName );
     sal_uInt32 nSizeOfRecord = 0x14 + ( ( nLenOfUserName + 4 ) & ~ 3 );
 
-    mpCurUserStrm->WriteUInt16( (sal_uInt16)0 ).WriteUInt16( (sal_uInt16)EPP_CurrentUserAtom ).WriteUInt32( nSizeOfRecord );
+    mpCurUserStrm->WriteUInt16( 0 ).WriteUInt16( EPP_CurrentUserAtom ).WriteUInt32( nSizeOfRecord );
     mpCurUserStrm->WriteUInt32( (sal_uInt32)0x14 )                  // Len
                   .WriteUInt32( (sal_uInt32)0xe391c05f );           // Magic
 
     sal_uInt32 nEditPos = mpCurUserStrm->Tell();
     mpCurUserStrm->WriteUInt32( (sal_uInt32)0x0 )                   // OffsetToCurrentEdit;
-                  .WriteUInt16( (sal_uInt16)nLenOfUserName )
-                  .WriteUInt16( (sal_uInt16)0x3f4 )                 // DocFileVersion
+                  .WriteUInt16( nLenOfUserName )
+                  .WriteUInt16( 0x3f4 )                 // DocFileVersion
                   .WriteUChar( 3 )                      // MajorVersion
                   .WriteUChar( 0 )                      // MinorVersion
-                  .WriteUInt16( (sal_uInt16)0 );                    // Pad Word
+                  .WriteUInt16( 0 );                    // Pad Word
     pUserName[ nLenOfUserName ] = 8;
     mpCurUserStrm->Write( pUserName, nLenOfUserName + 1 );
     for ( sal_uInt32 i = 0x15 + nLenOfUserName; i < nSizeOfRecord; i++ )
@@ -838,10 +838,10 @@ bool PPTWriter::ImplCreateDocument()
                     const sal_Unicode* pCustomShow = aCustomShow.getStr();
                     for ( i = 0; i < nCustomShowNameLen; i++ )
                     {
-                        mpStrm->WriteUInt16( (sal_uInt16)( pCustomShow[ i ] ) );
+                        mpStrm->WriteUInt16( ( pCustomShow[ i ] ) );
                     }
                 }
-                for ( i = nCustomShowNameLen; i < 32; i++, mpStrm->WriteUInt16( (sal_uInt16)0 ) ) ;
+                for ( i = nCustomShowNameLen; i < 32; i++, mpStrm->WriteUInt16( 0 ) ) ;
 
                 mpStrm->WriteUInt32( nFlags );
                 ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XCustomPresentationSupplier >
@@ -870,7 +870,7 @@ bool PPTWriter::ImplCreateDocument()
                                         nNamedShowLen = 31;
                                     mpPptEscherEx->AddAtom( nNamedShowLen << 1, EPP_CString );
                                     const sal_Unicode* pCustomShowName = pUString[ i ].getStr();
-                                    for ( sal_uInt32 k = 0; k < nNamedShowLen; mpStrm->WriteUInt16( (sal_uInt16)( pCustomShowName[ k++ ] ) ) ) ;
+                                    for ( sal_uInt32 k = 0; k < nNamedShowLen; mpStrm->WriteUInt16( ( pCustomShowName[ k++ ] ) ) ) ;
                                     mAny = aXCont->getByName( pUString[ i ] );
                                     if ( mAny.getValue() )
                                     {
@@ -976,7 +976,7 @@ bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
                 {
                     rStrm.WriteUInt16( rUrl[ i ] );
                 }
-                rStrm.WriteUInt16( (sal_uInt16)0 );
+                rStrm.WriteUInt16( 0 );
             }
             break;
             case 2 :
@@ -990,8 +990,8 @@ bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
                     rStrm.WriteUInt16( rUrl[ i ] );
                 }
                 if ( ! ( i & 1 ) )
-                    rStrm.WriteUInt16( (sal_uInt16)0 );
-                rStrm  .WriteUInt16( (sal_uInt16)0 )
+                    rStrm.WriteUInt16( 0 );
+                rStrm  .WriteUInt16( 0 )
                        .WriteUInt32( (sal_uInt32)0x1f )
                        .WriteUInt32( (sal_uInt32)1 )
                        .WriteUInt32( (sal_uInt32)0 );
@@ -1138,8 +1138,8 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum )
     mpPptEscherEx->OpenContainer( EPP_Notes );
     mpPptEscherEx->AddAtom( 8, EPP_NotesAtom, 1 );
     mpStrm->WriteUInt32( (sal_uInt32)nPageNum + 0x100 )
-           .WriteUInt16( (sal_uInt16)3 )                                        // follow master ....
-           .WriteUInt16( (sal_uInt16)0 );
+           .WriteUInt16( 3 )                                        // follow master ....
+           .WriteUInt16( 0 );
 
     ImplCreateHeaderFooters( mXPagePropSet );
 
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 30ec562f60e4..b5fce12a4cd6 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -204,7 +204,7 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream
               .WriteInt32( nXOrigin ).WriteInt32( nYOrigin )              // Origin
               .WriteUChar( 1 )                          // Bool1 varScale - Set if zoom to fit is set
               .WriteUChar( 0 )                          // bool1 draftMode - Not used
-              .WriteUInt16( (sal_uInt16)0 )                         // padword
+              .WriteUInt16( 0 )                         // padword
               .WriteUInt32( (sal_uInt32)( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) ).WriteUInt32( (sal_uInt32)8 )
               .WriteUInt32( (sal_uInt32)0 )     // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one.
               .WriteInt32( nPosition1 )    // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal.
@@ -228,7 +228,7 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm )
               .WriteInt32( (sal_Int32)-780 ).WriteInt32( (sal_Int32)-84 ) // Origin
               .WriteUChar( 1 )                  // bool1 varScale - Set if zoom to fit is set
               .WriteUChar( 0 )                  // bool1 draftMode - Not used
-              .WriteUInt16( (sal_uInt16)0 );                // padword
+              .WriteUInt16( 0 );                // padword
     }
     return nSize;
 }
@@ -270,7 +270,7 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea
         pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ProgBinaryTag << 16 ) ) ).WriteUInt32( (sal_uInt32)0 )
               .WriteUInt32( (sal_uInt32)( EPP_CString << 16 ) ).WriteUInt32( (sal_uInt32)14 )
               .WriteUInt32( (sal_uInt32)0x5f005f ).WriteUInt32( (sal_uInt32)0x50005f )
-              .WriteUInt32( (sal_uInt32)0x540050 ).WriteUInt16( (sal_uInt16)0x39 );
+              .WriteUInt32( (sal_uInt32)0x540050 ).WriteUInt16( 0x39 );
     }
     if ( pStrm && pBinTagStrm )
     {
@@ -373,12 +373,12 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const
     }
     maHyperlink.push_back( EPPTHyperlink( sBookmarkURL, nType ) );
 
-    mpExEmbed->WriteUInt16( (sal_uInt16)0xf )
-               .WriteUInt16( (sal_uInt16)EPP_ExHyperlink )
+    mpExEmbed->WriteUInt16( 0xf )
+               .WriteUInt16( EPP_ExHyperlink )
                .WriteUInt32( (sal_uInt32)0 );
     sal_uInt32 nHyperSize, nHyperStart = mpExEmbed->Tell();
-    mpExEmbed->WriteUInt16( (sal_uInt16)0 )
-               .WriteUInt16( (sal_uInt16)EPP_ExHyperlinkAtom )
+    mpExEmbed->WriteUInt16( 0 )
+               .WriteUInt16( EPP_ExHyperlinkAtom )
                .WriteUInt32( (sal_uInt32)4 )
                .WriteUInt32( nHyperId );
 
@@ -406,7 +406,7 @@ bool PPTWriter::ImplCloseDocument()
         SvMemoryStream aTxMasterStyleAtomStrm( 0x200, 0x200 );
         {
             EscherExAtom aTxMasterStyleAtom( aTxMasterStyleAtomStrm, EPP_TxMasterStyleAtom, EPP_TEXTTYPE_Other );
-            aTxMasterStyleAtomStrm.WriteUInt16( (sal_uInt16)5 );        // paragraph count
+            aTxMasterStyleAtomStrm.WriteUInt16( 5 );        // paragraph count
             sal_uInt16 nLev;
             bool bFirst = true;
             for ( nLev = 0; nLev < 5; nLev++ )
@@ -444,11 +444,11 @@ bool PPTWriter::ImplCloseDocument()
         // CREATE HYPERLINK CONTAINER
         if ( nExEmbedSize )
         {
-            mpStrm->WriteUInt16( (sal_uInt16)0xf )
-                   .WriteUInt16( (sal_uInt16)EPP_ExObjList )
+            mpStrm->WriteUInt16( 0xf )
+                   .WriteUInt16( EPP_ExObjList )
                    .WriteUInt32( (sal_uInt32)( nExEmbedSize + 12 ) )
-                   .WriteUInt16( (sal_uInt16)0 )
-                   .WriteUInt16( (sal_uInt16)EPP_ExObjListAtom )
+                   .WriteUInt16( 0 )
+                   .WriteUInt16( EPP_ExObjListAtom )
                    .WriteUInt32( (sal_uInt32)4 )
                    .WriteUInt32( (sal_uInt32)mnExEmbed );
             mpPptEscherEx->InsertPersistOffset( EPP_Persist_ExObj, mpStrm->Tell() );
@@ -456,15 +456,15 @@ bool PPTWriter::ImplCloseDocument()
         }
 
         // CREATE ENVIRONMENT
-        mpStrm->WriteUInt16( (sal_uInt16)0xf ).WriteUInt16( (sal_uInt16)EPP_Environment ).WriteUInt32( (sal_uInt32)nEnvironment );
+        mpStrm->WriteUInt16( 0xf ).WriteUInt16( EPP_Environment ).WriteUInt32( (sal_uInt32)nEnvironment );
 
         // Open Container ( EPP_SrKinsoku )
-        mpStrm->WriteUInt16( (sal_uInt16)0x2f ).WriteUInt16( (sal_uInt16)EPP_SrKinsoku ).WriteUInt32( (sal_uInt32)12 );
+        mpStrm->WriteUInt16( 0x2f ).WriteUInt16( EPP_SrKinsoku ).WriteUInt32( (sal_uInt32)12 );
         mpPptEscherEx->AddAtom( 4, EPP_SrKinsokuAtom, 0, 3 );
         mpStrm->WriteInt32( (sal_Int32)0 );                        // SrKinsoku Level 0
 
         // Open Container ( EPP_FontCollection )
-        mpStrm->WriteUInt16( (sal_uInt16)0xf ).WriteUInt16( (sal_uInt16)EPP_FontCollection ).WriteUInt32( (sal_uInt32)maFontCollection.GetCount() * 76 );
+        mpStrm->WriteUInt16( 0xf ).WriteUInt16( EPP_FontCollection ).WriteUInt32( (sal_uInt32)maFontCollection.GetCount() * 76 );
 
         for ( sal_uInt32 i = 0; i < maFontCollection.GetCount(); i++ )
         {
@@ -745,7 +745,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
         if ( nPropertyFlags & 0xf )
             rOut.WriteInt16( nBulletFlags );
         if ( nPropertyFlags & 0x80 )
-            rOut.WriteUInt16( (sal_uInt16)( pPara->cBulletId ) );
+            rOut.WriteUInt16( ( pPara->cBulletId ) );
         if ( nPropertyFlags & 0x10 )
             rOut.WriteUInt16( nFontId );
         if ( nPropertyFlags & 0x40 )
@@ -766,17 +766,17 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
             rOut.WriteUInt32( nBulletColor );
         }
         if ( nPropertyFlags & 0x00000800 )
-            rOut.WriteUInt16( (sal_uInt16)( pPara->mnTextAdjust ) );
+            rOut.WriteUInt16( ( pPara->mnTextAdjust ) );
         if ( nPropertyFlags & 0x00001000 )
-            rOut.WriteUInt16( (sal_uInt16)( nLineSpacing ) );
+            rOut.WriteUInt16( ( nLineSpacing ) );
         if ( nPropertyFlags & 0x00002000 )
-            rOut.WriteUInt16( (sal_uInt16)( pPara->mnLineSpacingTop ) );
+            rOut.WriteUInt16( ( pPara->mnLineSpacingTop ) );
         if ( nPropertyFlags & 0x00004000 )
-            rOut.WriteUInt16( (sal_uInt16)( pPara->mnLineSpacingBottom ) );
+            rOut.WriteUInt16( ( pPara->mnLineSpacingBottom ) );
         if ( nPropertyFlags & 0x100 )
-            rOut.WriteUInt16( (sal_uInt16)(pPara->nTextOfs) );
+            rOut.WriteUInt16( (pPara->nTextOfs) );
         if (  nPropertyFlags & 0x400 )
-            rOut.WriteUInt16( (sal_uInt16)(pPara->nBulletOfs) );
+            rOut.WriteUInt16( (pPara->nBulletOfs) );
         if ( nPropertyFlags & 0x000e0000 )
         {
             sal_uInt16 nAsianSettings = 0;
@@ -960,13 +960,13 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
                 .WriteUInt32( nPropertyFlags );          //PropertyFlags
 
             if ( nPropertyFlags & 0xffff )
-                rOut.WriteUInt16( (sal_uInt16)( nCharAttr ) );
+                rOut.WriteUInt16( ( nCharAttr ) );
             if ( nPropertyFlags & 0x00010000 )
                 rOut.WriteUInt16( rPortion.mnFont );
             if ( nPropertyFlags & 0x00200000 )
                 rOut.WriteUInt16( rPortion.mnAsianOrComplexFont );
             if ( nPropertyFlags & 0x00020000 )
-                rOut.WriteUInt16( (sal_uInt16)( rPortion.mnCharHeight ) );
+                rOut.WriteUInt16( ( rPortion.mnCharHeight ) );
             if ( nPropertyFlags & 0x00040000 )
                 rOut.WriteUInt32( (sal_uInt32)nCharColor );
             if ( nPropertyFlags & 0x00080000 )
@@ -1113,7 +1113,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
                             rOut.WriteUInt32( (sal_uInt32)( EPP_DateTimeMCAtom << 16 ) ).WriteUInt32( (sal_uInt32)8 )
                                 .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) )         // TxtOffset to TxtField;
                                 .WriteUChar( ( pFieldEntry->nFieldType & 0xff ) )       // Type
-                                .WriteUChar( 0 ).WriteUInt16( (sal_uInt16)0 );                      // PadBytes
+                                .WriteUChar( 0 ).WriteUInt16( 0 );                      // PadBytes
                         }
                         break;
                         case 3 :
@@ -1276,7 +1276,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
                 pRuleOut->WriteUInt32( nTextRulerAtomFlags );
                 if ( nTextRulerAtomFlags & 4 )
                 {
-                    pRuleOut->WriteUInt16( (sal_uInt16)nTabCount );
+                    pRuleOut->WriteUInt16( nTabCount );
                     for ( i = 0; i < nTabs; i++ )
                     {
                         sal_uInt16 nPosition = (sal_uInt16)( ( pTabStop[ i ].Position / 4.40972 ) + nTextOfs );
@@ -1369,7 +1369,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
                         rExtBuStr.WriteUInt32( (sal_uInt32)nNumberingType );
                     }
                     if ( nBulletFlags & 0x2000000 )
-                        rExtBuStr.WriteUInt16( (sal_uInt16)pBulletPara->nStartWith );
+                        rExtBuStr.WriteUInt16( pBulletPara->nStartWith );
                     rExtBuStr.WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 );
                 }
                 sal_uInt32 nBulletSize = ( rExtBuStr.Tell() - nPos2 ) - 8;
@@ -1895,7 +1895,7 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
        .WriteUInt16( nOrder )                                   // order of build ( 1.. )
        .WriteUInt16( nSlideCount ).WriteUChar( nBuildType ).WriteUChar( nFlyMethod ).WriteUChar( nFlyDirection )
        .WriteUChar( nAfterEffect ).WriteUChar( nSubEffect ).WriteUChar( nOleVerb )
-       .WriteUInt16( (sal_uInt16)0 );                               // PadWord
+       .WriteUInt16( 0 );                               // PadWord
 }
 
 void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eCa, bool bMediaClickAction )
@@ -2118,7 +2118,7 @@ bool PPTWriter::ImplCreatePresentationPlaceholder( const bool bMasterPage, const
         mpStrm->WriteUInt32( (sal_uInt32)0 )                // PlacementID
                .WriteUChar( nPlaceHolderId )    // PlaceHolderID
                .WriteUChar( 0 )                 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
-               .WriteUInt16( (sal_uInt16)0 );               // padword
+               .WriteUInt16( 0 );               // padword
         mpPptEscherEx->CloseContainer();        // ESCHER_ClientData
 
         if ( aClientTextBox.Tell() )
@@ -2816,7 +2816,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                                 mpStrm->WriteUInt32( (sal_uInt32)0 )                                                        // PlacementID
                                        .WriteUChar( EPP_PLACEHOLDER_MASTERTITLE )                               // PlaceHolderID
                                        .WriteUChar( 0 )                                                         // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
-                                       .WriteUInt16( (sal_uInt16)0 );                                                       // padword
+                                       .WriteUInt16( 0 );                                                       // padword
                                 mpPptEscherEx->CloseContainer();    // ESCHER_ClientData
                                 mpPptEscherEx->OpenContainer( ESCHER_ClientTextbox );
                                 mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom );
@@ -2831,9 +2831,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                                     mpStrm->WriteUInt16( nChar );
                                 }
                                 mpPptEscherEx->AddAtom( 6, EPP_BaseTextPropAtom );
-                                mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize + 1 ) ).WriteUInt16( (sal_uInt16)0 );
+                                mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize + 1 ) ).WriteUInt16( 0 );
                                 mpPptEscherEx->AddAtom( 10, EPP_TextSpecInfoAtom );
-                                mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize + 1 ) ).WriteUInt32( (sal_uInt32)1 ).WriteUInt16( (sal_uInt16)0 );
+                                mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize + 1 ) ).WriteUInt32( (sal_uInt32)1 ).WriteUInt16( 0 );
                                 mpPptEscherEx->CloseContainer();    // ESCHER_ClientTextBox
                                 mpPptEscherEx->CloseContainer();    // ESCHER_SpContainer
                             }
@@ -2909,7 +2909,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                                 mpStrm->WriteUInt32( (sal_uInt32)1 )                                                        // PlacementID
                                        .WriteUChar( PlaceHolderID )/*(sal_uInt8)EPP_PLACEHOLDER_MASTERBODY */                                   // PlaceHolderID
                                        .WriteUChar( 0 )                                                         // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
-                                       .WriteUInt16( (sal_uInt16)0 );                                                       // padword
+                                       .WriteUInt16( 0 );                                                       // padword
                                 mpPptEscherEx->CloseContainer();    // ESCHER_ClientData
                                 mpPptEscherEx->OpenContainer( ESCHER_ClientTextbox );       // printf
                                 mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom );
@@ -2933,7 +2933,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                                 }
                                 mpPptEscherEx->EndAtom( EPP_BaseTextPropAtom );
                                 mpPptEscherEx->AddAtom( 10, EPP_TextSpecInfoAtom );
-                                mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize ) ).WriteUInt32( (sal_uInt32)1 ).WriteUInt16( (sal_uInt16)0 );
+                                mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize ) ).WriteUInt32( (sal_uInt32)1 ).WriteUInt16( 0 );
 
                                 mpPptEscherEx->CloseContainer();    // ESCHER_ClientTextBox
                                 mpPptEscherEx->CloseContainer();    // ESCHER_SpContainer
@@ -3135,24 +3135,24 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                         // SJ: creating the Media RefObj
                         sal_uInt32 nRefId = ++mnExEmbed;
 
-                        mpExEmbed->WriteUInt16( (sal_uInt16)0xf )
-                                   .WriteUInt16( (sal_uInt16)EPP_ExMCIMovie )       // PPT_PST_ExAviMovie
+                        mpExEmbed->WriteUInt16( 0xf )
+                                   .WriteUInt16( EPP_ExMCIMovie )       // PPT_PST_ExAviMovie
                                    .WriteUInt32( (sal_uInt32)0 );
                         sal_uInt32 nSize, nStart = mpExEmbed->Tell();
-                        mpExEmbed->WriteUInt16( (sal_uInt16)0 )
-                                   .WriteUInt16( (sal_uInt16)EPP_ExObjRefAtom )
+                        mpExEmbed->WriteUInt16( 0 )
+                                   .WriteUInt16( EPP_ExObjRefAtom )
                                    .WriteUInt32( (sal_uInt32)4 )
                                    .WriteUInt32( nRefId );
-                        mpExEmbed->WriteUInt16( (sal_uInt16)0xf )
-                                   .WriteUInt16( (sal_uInt16)EPP_ExVideo )
+                        mpExEmbed->WriteUInt16( 0xf )
+                                   .WriteUInt16( EPP_ExVideo )
                                    .WriteUInt32( (sal_uInt32)0 );
 
-                        mpExEmbed->WriteUInt16( (sal_uInt16)0 )
-                                   .WriteUInt16( (sal_uInt16)EPP_ExMediaAtom )
+                        mpExEmbed->WriteUInt16( 0 )
+                                   .WriteUInt16( EPP_ExMediaAtom )
                                    .WriteUInt32( (sal_uInt32)8 )
                                    .WriteUInt32( nRefId )
-                                   .WriteUInt16( (sal_uInt16)0 )
-                                   .WriteUInt16( (sal_uInt16)0x435 );
+                                   .WriteUInt16( 0 )
+                                   .WriteUInt16( 0x435 );
 
                         sal_uInt16 i, nStringLen = (sal_uInt16)aMediaURL.getLength();
                         mpExEmbed->WriteUInt32( (sal_uInt32)( EPP_CString << 16 ) ).WriteUInt32( (sal_uInt32)( nStringLen * 2 ) );
@@ -3171,14 +3171,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
 
                         if ( !pClientData )
                             pClientData = new SvMemoryStream( 0x200, 0x200 );
-                        pClientData->WriteUInt16( (sal_uInt16)0 )
-                                    .WriteUInt16( (sal_uInt16)EPP_ExObjRefAtom )
+                        pClientData->WriteUInt16( 0 )
+                                    .WriteUInt16( EPP_ExObjRefAtom )
                                     .WriteUInt32( (sal_uInt32)4 )
                                     .WriteUInt32( nRefId );
                         // write EPP_InteractiveInfo container for no_action
                         pClientData->WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)24 );
-                        pClientData->WriteUInt16( (sal_uInt16)0 )
-                                    .WriteUInt16( (sal_uInt16)EPP_InteractiveInfoAtom )
+                        pClientData->WriteUInt16( 0 )
+                                    .WriteUInt16( EPP_InteractiveInfoAtom )
                                     .WriteUInt32( (sal_uInt32)16 )
                                     .WriteUInt32( (sal_uInt32) 0 )
                                     .WriteUInt32( (sal_uInt32) 0 )
@@ -3252,7 +3252,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                                 .WriteInt32( nPlacementID )                // PlacementID
                                 .WriteUChar( nPlaceHolderAtom ) // PlaceHolderID
                                 .WriteUChar( 0 )                // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
-                                .WriteUInt16( (sal_uInt16)0 );              // padword
+                                .WriteUInt16( 0 );              // padword
                 }
                 if ( nOlePictureId )
                 {
@@ -3634,7 +3634,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
                 aMemStrm.ObjectOwnsMemory( false );
                 aMemStrm.WriteUInt16( nRowCount )
                         .WriteUInt16( nRowCount )
-                        .WriteUInt16( (sal_uInt16)4 );
+                        .WriteUInt16( 4 );
 
                 std::vector< std::pair< sal_Int32, sal_Int32 > >::const_iterator aIter( aRows.begin() );
                 while( aIter != aRows.end() )
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index c2862793b36f..8a7794ef4830 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -85,12 +85,12 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt )
     {
         rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 ) )
            .WriteUInt32( (sal_uInt32)( nSize - 8 ) )
-           .WriteUInt16( (sal_uInt16)ESCHER_Prop_fillColor )           .WriteUInt32( (sal_uInt32)0xffb800 )
-           .WriteUInt16( (sal_uInt16)ESCHER_Prop_fillBackColor )       .WriteUInt32( (sal_uInt32)0 )
-           .WriteUInt16( (sal_uInt16)ESCHER_Prop_fNoFillHitTest )      .WriteUInt32( (sal_uInt32)0x00100010 )
-           .WriteUInt16( (sal_uInt16)ESCHER_Prop_lineColor )           .WriteUInt32( (sal_uInt32)0x8000001 )
-           .WriteUInt16( (sal_uInt16)ESCHER_Prop_fNoLineDrawDash )     .WriteUInt32( (sal_uInt32)0x00080008 )
-           .WriteUInt16( (sal_uInt16)ESCHER_Prop_shadowColor )         .WriteUInt32( (sal_uInt32)0x8000002 );
+           .WriteUInt16( ESCHER_Prop_fillColor )           .WriteUInt32( (sal_uInt32)0xffb800 )
+           .WriteUInt16( ESCHER_Prop_fillBackColor )       .WriteUInt32( (sal_uInt32)0 )
+           .WriteUInt16( ESCHER_Prop_fNoFillHitTest )      .WriteUInt32( (sal_uInt32)0x00100010 )
+           .WriteUInt16( ESCHER_Prop_lineColor )           .WriteUInt32( (sal_uInt32)0x8000001 )
+           .WriteUInt16( ESCHER_Prop_fNoLineDrawDash )     .WriteUInt32( (sal_uInt32)0x00080008 )
+           .WriteUInt16( ESCHER_Prop_shadowColor )         .WriteUInt32( (sal_uInt32)0x8000002 );
     }
 }
 
@@ -125,7 +125,7 @@ PptEscherEx::~PptEscherEx()
 
 void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance )
 {
-    mpOutStrm->WriteUInt16( (sal_uInt16)( ( nRecInstance << 4 ) | 0xf  ) ).WriteUInt16( n_EscherContainer ).WriteUInt32( (sal_uInt32)0 );
+    mpOutStrm->WriteUInt16( ( ( nRecInstance << 4 ) | 0xf  ) ).WriteUInt16( n_EscherContainer ).WriteUInt32( (sal_uInt32)0 );
     mOffsets.push_back( mpOutStrm->Tell() - 4 );
     mRecTypes.push_back( n_EscherContainer );
 
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index de87bfe01e78..f9ed8b433d48 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -1231,7 +1231,7 @@ void AnimationExporter::writeZString( SvStream& rStrm, const OUString& rVal )
     sal_Int32 i;
     for ( i = 0; i < rVal.getLength(); i++ )
         rStrm.WriteUInt16( rVal[ i ] );
-    rStrm.WriteUInt16( (sal_Unicode)0 );
+    rStrm.WriteUInt16( 0 );
 }
 
 void AnimationExporter::exportAnimAction( SvStream& rStrm, const Reference< XAnimationNode >& xNode )
diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx
index d7d86bd2fa01..25b39a914eaa 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.cxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.cxx
@@ -198,7 +198,7 @@ void ExSoundCollection::Write( SvStream& rSt ) const
         sal_uInt32 nSoundCount = maEntries.size();
 
         // create SoundCollection Container
-        rSt.WriteUInt16( (sal_uInt16)0xf ).WriteUInt16( (sal_uInt16)EPP_SoundCollection ).WriteUInt32( (sal_uInt32)( GetSize() - 8 ) );
+        rSt.WriteUInt16( 0xf ).WriteUInt16( EPP_SoundCollection ).WriteUInt32( (sal_uInt32)( GetSize() - 8 ) );
 
         // create SoundCollAtom ( reference to the next free SoundId );
         rSt.WriteUInt32( (sal_uInt32)( EPP_SoundCollAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 ).WriteUInt32( nSoundCount );
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index 98e9de6351e8..56706e1b5ab2 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -121,8 +121,8 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, bool,
     else
     {
         rSt.WriteUInt16( rLev.mnAsianOrComplexFont )
-           .WriteUInt16( (sal_uInt16)0xffff )       // unknown
-           .WriteUInt16( (sal_uInt16)0xffff )       // unknown
+           .WriteUInt16( 0xffff )       // unknown
+           .WriteUInt16( 0xffff )       // unknown
            .WriteUInt16( rLev.mnFontHeight )
            .WriteUInt32( nFontColor )
            .WriteUInt16( rLev.mnEscapement );
@@ -326,15 +326,15 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, bool,
         {
             rOut.WriteUInt32( (sal_uInt32)( ( EPP_PST_ExtendedParagraphMasterAtom << 16 ) | ( mnInstance << 4 ) ) )
                 .WriteUInt32( (sal_uInt32)( 5 * 16 + 2 ) )
-                .WriteUInt16( (sal_uInt16)5 );              // depth
+                .WriteUInt16( 5 );              // depth
         }
         sal_uInt16 nBulletId = rLev.mnBulletId;
         if ( rLev.mnNumberingType != SVX_NUM_BITMAP )
             nBulletId = 0xffff;
         rOut.WriteUInt32( (sal_uInt32)0x03800000 )
-            .WriteUInt16( (sal_uInt16)nBulletId )
+            .WriteUInt16( nBulletId )
             .WriteUInt32( (sal_uInt32)rLev.mnMappedNumType )
-            .WriteUInt16( (sal_uInt16)rLev.mnBulletStart )
+            .WriteUInt16( rLev.mnBulletStart )
             .WriteUInt32( (sal_uInt32)0 );
     }
 
@@ -377,8 +377,8 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, bool,
     else
     {
         rSt.WriteUInt16( rLev.mnDefaultTab )
-           .WriteUInt16( (sal_uInt16)0 )
-           .WriteUInt16( (sal_uInt16)0 )
+           .WriteUInt16( 0 )
+           .WriteUInt16( 0 )
            .WriteUInt16( rLev.mnAsianSettings )
            .WriteUInt16( rLev.mnBiDi );
     }
@@ -485,9 +485,9 @@ void PPTExStyleSheet::WriteTxCFStyleAtom( SvStream& rSt )
 
     rSt.WriteUInt32( (sal_uInt32)( EPP_TxCFStyleAtom << 16 ) )  // recordheader
        .WriteUInt32( SizeOfTxCFStyleAtom() - 8 )
-       .WriteUInt16( (sal_uInt16)( 0x80 | nCharFlags ) )
-       .WriteUInt16( (sal_uInt16)nFlags )
-       .WriteUInt16( (sal_uInt16)nCharFlags )
+       .WriteUInt16( ( 0x80 | nCharFlags ) )
+       .WriteUInt16( nFlags )
+       .WriteUInt16( nCharFlags )
        .WriteInt32( (sal_Int32)-1 )                            // ?
        .WriteUInt16( rCharStyle.mnFontHeight )
        .WriteUInt32( rCharStyle.mnFontColor );
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 358157662ff5..b2c25b55eb27 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -224,7 +224,7 @@ void PortionObj::Write( SvStream* pStrm, bool bLast )
     if ( bLast && mbLastPortion )
         nCount--;
     for ( sal_uInt32 i = 0; i < nCount; i++ )
-        pStrm->WriteUInt16( (sal_uInt16)mpText[ i ] );
+        pStrm->WriteUInt16( mpText[ i ] );
 }
 
 void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue )
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 3ec6d184c174..e863d906f62a 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -301,13 +301,13 @@ SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDes
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aDesignName,
         RTL_TEXTENCODING_UTF8);
 
-    rOut.WriteUInt16( (sal_uInt16)rDesign.m_eMode );
+    rOut.WriteUInt16( rDesign.m_eMode );
     rOut.WriteUChar( rDesign.m_bContentPage );
     rOut.WriteUChar( rDesign.m_bNotes );
     rOut.WriteUInt16( rDesign.m_nResolution );
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCompression,
         RTL_TEXTENCODING_UTF8);
-    rOut.WriteUInt16( (sal_uInt16)rDesign.m_eFormat );
+    rOut.WriteUInt16( rDesign.m_eFormat );
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aAuthor,
         RTL_TEXTENCODING_UTF8);
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aEMail,
@@ -328,7 +328,7 @@ SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDes
     rOut.WriteUChar( rDesign.m_bUseAttribs );
     rOut.WriteUChar( rDesign.m_bUseColor );
 
-    rOut.WriteUInt16( (sal_uInt16)rDesign.m_eScript );
+    rOut.WriteUInt16( rDesign.m_eScript );
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aURL,
         RTL_TEXTENCODING_UTF8);
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCGI,
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index 53796eab4c87..ddd7e5e99301 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -100,7 +100,7 @@ void MorphDlg::SaveSettings() const
     {
         SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 );
 
-        xOStm->WriteUInt16( (sal_uInt16) m_pMtfSteps->GetValue() )
+        xOStm->WriteUInt16( m_pMtfSteps->GetValue() )
               .WriteUChar( m_pCbxOrientation->IsChecked() )
               .WriteUChar( m_pCbxAttributes->IsChecked() );
     }
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index edd9a7f565ff..ee7c184e5b37 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -334,8 +334,8 @@ void SdVectorizeDlg::SaveSettings() const
     if( xOStm.Is() )
     {
         SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 );
-        xOStm->WriteUInt16( (sal_uInt16) m_pNmLayers->GetValue() ).WriteUInt16( (sal_uInt16) m_pMtReduce->GetValue() );
-        xOStm->WriteUInt16( (sal_uInt16) m_pMtFillHoles->GetValue() ).WriteUChar( m_pCbFillHoles->IsChecked() );
+        xOStm->WriteUInt16( m_pNmLayers->GetValue() ).WriteUInt16( m_pMtReduce->GetValue() );
+        xOStm->WriteUInt16( m_pMtFillHoles->GetValue() ).WriteUChar( m_pCbFillHoles->IsChecked() );
     }
 }