re-write SvStream operator<< to non-overloaded methods

This is the actual re-write.

Use a clang rewriter to rewrite SvStream::operator<< to methods
like WriteuInt32.
Note that the rewriter is not perfect, and I hand-tweaked the output.
In particular, I had to adjust places doing things like
(*this) << 1;

Change-Id: I5923eda3f4ebaa8b452b6ef109e726e116235a2a
Reviewed-on: https://gerrit.libreoffice.org/7342
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

9 files changed, 201 insertions, 198 deletions

diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index e85448e2f520..6b4713ba4f72 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -387,17 +387,17 @@ bool EditTextObject::Store( SvStream& rOStream ) const
     sal_Size nStartPos = rOStream.Tell();
 
     sal_uInt16 nWhich = static_cast<sal_uInt16>(EE_FORMAT_BIN);
-    rOStream << nWhich;
+    rOStream.WriteUInt16( nWhich );
 
     sal_uInt32 nStructSz = 0;
-    rOStream << nStructSz;
+    rOStream.WriteUInt32( nStructSz );
 
     StoreData( rOStream );
 
     sal_Size nEndPos = rOStream.Tell();
     nStructSz = nEndPos - nStartPos - sizeof( nWhich ) - sizeof( nStructSz );
     rOStream.Seek( nStartPos + sizeof( nWhich ) );
-    rOStream << nStructSz;
+    rOStream.WriteUInt32( nStructSz );
     rOStream.Seek( nEndPos );
 
     return rOStream.GetError() ? false : true;
@@ -1106,9 +1106,9 @@ public:
 void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
 {
     sal_uInt16 nVer = 602;
-    rOStream << nVer;
+    rOStream.WriteUInt16( nVer );
 
-    rOStream << static_cast<sal_Bool>(bOwnerOfPool);
+    rOStream.WriteUChar( static_cast<sal_Bool>(bOwnerOfPool) );
 
     // First store the pool, later only the Surregate
     if ( bOwnerOfPool )
@@ -1119,14 +1119,14 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
 
     // Store Current text encoding ...
     rtl_TextEncoding eEncoding = GetSOStoreTextEncoding( osl_getThreadTextEncoding() );
-    rOStream << (sal_uInt16) eEncoding;
+    rOStream.WriteUInt16( (sal_uInt16) eEncoding );
 
     // The number of paragraphs ...
     size_t nParagraphs = aContents.size();
     // FIXME: this truncates, check usage of stream and if it can be changed,
     // i.e. is not persistent, adapt this and reader.
     sal_uInt16 nParagraphs_Stream = static_cast<sal_uInt16>(nParagraphs);
-    rOStream << nParagraphs_Stream;
+    rOStream.WriteUInt16( nParagraphs_Stream );
 
     sal_Unicode nUniChar = CH_FEATURE;
     char cFeatureConverted = OString(&nUniChar, 1, eEncoding).toChar();
@@ -1223,14 +1223,14 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
 
         // StyleName and Family...
         write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rC.GetStyle(), eEncoding);
-        rOStream << static_cast<sal_uInt16>(rC.GetFamily());
+        rOStream.WriteUInt16( static_cast<sal_uInt16>(rC.GetFamily()) );
 
         // Paragraph attributes ...
         rC.GetParaAttribs().Store( rOStream );
 
         // The number of attributes ...
         size_t nAttribs = rC.aAttribs.size();
-        rOStream << static_cast<sal_uInt16>(nAttribs);
+        rOStream.WriteUInt16( static_cast<sal_uInt16>(nAttribs) );
 
         // And the individual attributes
         // Items as Surregate => always 8 bytes per Attribute
@@ -1239,36 +1239,36 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
         {
             const XEditAttribute& rX = rC.aAttribs[nAttr];
 
-            rOStream << rX.GetItem()->Which();
+            rOStream.WriteUInt16( rX.GetItem()->Which() );
             GetPool()->StoreSurrogate(rOStream, rX.GetItem());
-            rOStream << rX.GetStart();
-            rOStream << rX.GetEnd();
+            rOStream.WriteUInt16( rX.GetStart() );
+            rOStream.WriteUInt16( rX.GetEnd() );
         }
     }
 
-    rOStream << nMetric;
+    rOStream.WriteUInt16( nMetric );
 
-    rOStream << nUserType;
-    rOStream << nObjSettings;
+    rOStream.WriteUInt16( nUserType );
+    rOStream.WriteUInt32( nObjSettings );
 
-    rOStream << static_cast<sal_Bool>(bVertical);
-    rOStream << nScriptType;
+    rOStream.WriteUChar( static_cast<sal_Bool>(bVertical) );
+    rOStream.WriteUInt16( nScriptType );
 
-    rOStream << static_cast<sal_Bool>(bStoreUnicodeStrings);
+    rOStream.WriteUChar( static_cast<sal_Bool>(bStoreUnicodeStrings) );
     if ( bStoreUnicodeStrings )
     {
         for ( size_t nPara = 0; nPara < nParagraphs_Stream; nPara++ )
         {
             const ContentInfo& rC = aContents[nPara];
             sal_uInt16 nL = rC.GetText().getLength();
-            rOStream << nL;
+            rOStream.WriteUInt16( nL );
             rOStream.Write(rC.GetText().getStr(), nL*sizeof(sal_Unicode));
 
             // StyleSheetName must be Unicode too!
             // Copy/Paste from EA3 to BETA or from BETA to EA3 not possible, not needed...
             // If needed, change nL back to sal_uLong and increase version...
             nL = rC.GetStyle().getLength();
-            rOStream << nL;
+            rOStream.WriteUInt16( nL );
             rOStream.Write(rC.GetStyle().getStr(), nL*sizeof(sal_Unicode));
         }
     }
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 1f23708e6219..da40d02b7a31 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -39,24 +39,24 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
     sal_uInt16 nTemp;
 
     rStream << rFont.GetColor();
-    nTemp = (sal_uInt16)rFont.GetFamily(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetFamily(); rStream.WriteUInt16( nTemp );
 
     nTemp = (sal_uInt16)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet());
-    rStream << nTemp;
+    rStream.WriteUInt16( nTemp );
 
-    nTemp = (sal_uInt16)rFont.GetPitch(); rStream << nTemp;
-    nTemp = (sal_uInt16)rFont.GetAlign(); rStream << nTemp;
-    nTemp = (sal_uInt16)rFont.GetWeight(); rStream << nTemp;
-    nTemp = (sal_uInt16)rFont.GetUnderline(); rStream << nTemp;
-    nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream << nTemp;
-    nTemp = (sal_uInt16)rFont.GetItalic(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetPitch(); rStream.WriteUInt16( nTemp );
+    nTemp = (sal_uInt16)rFont.GetAlign(); rStream.WriteUInt16( nTemp );
+    nTemp = (sal_uInt16)rFont.GetWeight(); rStream.WriteUInt16( nTemp );
+    nTemp = (sal_uInt16)rFont.GetUnderline(); rStream.WriteUInt16( nTemp );
+    nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream.WriteUInt16( nTemp );
+    nTemp = (sal_uInt16)rFont.GetItalic(); rStream.WriteUInt16( nTemp );
 
     // UNICODE: rStream << rFont.GetName();
     rStream.WriteUniOrByteString(rFont.GetName(), rStream.GetStreamCharSet());
 
-    rStream << rFont.IsOutline();
-    rStream << rFont.IsShadow();
-    rStream << rFont.IsTransparent();
+    rStream.WriteUChar( rFont.IsOutline() );
+    rStream.WriteUChar( rFont.IsShadow() );
+    rStream.WriteUChar( rFont.IsTransparent() );
 }
 
 // -----------------------------------------------------------------------
@@ -321,7 +321,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
         const_cast< SvxBulletItem* >( this )->nStyle = BS_NONE;
     }
 
-    rStrm << nStyle;
+    rStrm.WriteUInt16( nStyle );
 
     if( nStyle != BS_BMP )
         StoreFont( rStrm, aFont );
@@ -351,11 +351,11 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
         if ( (nEnd-_nStart) > 0xFF00 )
             rStrm.Seek( _nStart );
     }
-    rStrm << static_cast<sal_Int32>(nWidth);
-    rStrm << nStart;
-    rStrm << nJustify;
-    rStrm << OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar();
-    rStrm << nScale;
+    rStrm.WriteInt32( static_cast<sal_Int32>(nWidth) );
+    rStrm.WriteUInt16( nStart );
+    rStrm.WriteUChar( nJustify );
+    rStrm.WriteChar( OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar() );
+    rStrm.WriteUInt16( nScale );
 
     // UNICODE: rStrm << aPrevText;
     rStrm.WriteUniOrByteString(aPrevText, rStrm.GetStreamCharSet());
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index bf8f6499b2ba..11c079b542c5 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -429,9 +429,9 @@ void SvxDateField::Load( SvPersistStream & rStm )
 
 void SvxDateField::Save( SvPersistStream & rStm )
 {
-    rStm << nFixDate;
-    rStm << (sal_uInt16)eType;
-    rStm << (sal_uInt16)eFormat;
+    rStm.WriteUInt32( nFixDate );
+    rStm.WriteUInt16( (sal_uInt16)eType );
+    rStm.WriteUInt16( (sal_uInt16)eFormat );
 }
 
 // -----------------------------------------------------------------------
@@ -555,7 +555,7 @@ int SvxURLField::operator==( const SvxFieldData& rOther ) const
 static void write_unicode( SvPersistStream & rStm, const OUString& rString )
 {
     sal_uInt16 nL =  sal::static_int_cast<sal_uInt16>(rString.getLength());
-    rStm << nL;
+    rStm.WriteUInt16( nL );
     //endian specific?, yipes!
     rStm.Write( rString.getStr(), nL*sizeof(sal_Unicode) );
 }
@@ -591,7 +591,7 @@ void SvxURLField::Load( SvPersistStream & rStm )
 
 void SvxURLField::Save( SvPersistStream & rStm )
 {
-    rStm << (sal_uInt16)eFormat;
+    rStm.WriteUInt16( (sal_uInt16)eFormat );
 
     write_unicode( rStm, aURL );
     write_unicode( rStm, aRepresentation );
@@ -810,8 +810,8 @@ void SvxExtTimeField::Load( SvPersistStream & rStm )
 void SvxExtTimeField::Save( SvPersistStream & rStm )
 {
     rStm.WriteInt64(m_nFixTime);
-    rStm << (sal_uInt16) eType;
-    rStm << (sal_uInt16) eFormat;
+    rStm.WriteUInt16( (sal_uInt16) eType );
+    rStm.WriteUInt16( (sal_uInt16) eFormat );
 }
 
 //----------------------------------------------------------------------------
@@ -958,8 +958,8 @@ void SvxExtFileField::Save( SvPersistStream & rStm )
     // UNICODE: rStm << aFile;
     rStm.WriteUniOrByteString(aFile, rStm.GetStreamCharSet());
 
-    rStm << (sal_uInt16) eType;
-    rStm << (sal_uInt16) eFormat;
+    rStm.WriteUInt16( (sal_uInt16) eType );
+    rStm.WriteUInt16( (sal_uInt16) eFormat );
 }
 
 //----------------------------------------------------------------------------
@@ -1114,8 +1114,8 @@ void SvxAuthorField::Save( SvPersistStream & rStm )
     write_unicode( rStm, aFirstName );
     write_unicode( rStm, aShortName );
 
-    rStm << (sal_uInt16) eType;
-    rStm << (sal_uInt16) eFormat;
+    rStm.WriteUInt16( (sal_uInt16) eType );
+    rStm.WriteUInt16( (sal_uInt16) eFormat );
 }
 
 //----------------------------------------------------------------------------
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 020488cb9846..b48f8d3cb053 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -106,13 +106,13 @@ namespace
     /// Store a border line to a stream.
     SvStream& StoreBorderLine(SvStream &stream, const SvxBorderLine &l, sal_uInt16 version)
     {
-        stream << l.GetColor()
-               << l.GetOutWidth()
-               << l.GetInWidth()
-               << l.GetDistance();
+        stream << l.GetColor();
+        stream.WriteUInt16( l.GetOutWidth() )
+              .WriteUInt16( l.GetInWidth() )
+              .WriteUInt16( l.GetDistance() );
 
         if (version >= BORDER_LINE_WITH_STYLE_VERSION)
-               stream << static_cast<sal_uInt16>(l.GetBorderLineStyle());
+               stream.WriteUInt16( static_cast<sal_uInt16>(l.GetBorderLineStyle()) );
 
         return stream;
     }
@@ -167,7 +167,7 @@ SfxPoolItem* SvxPaperBinItem::Clone( SfxItemPool* ) const
 
 SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << GetValue();
+    rStrm.WriteUChar( GetValue() );
     return rStrm;
 }
 
@@ -370,8 +370,8 @@ SfxItemPresentation SvxSizeItem::GetPresentation
 SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     //#fdo39428 SvStream no longer supports operator<<(long)
-    rStrm << sal::static_int_cast<sal_Int32>(aSize.Width());
-    rStrm << sal::static_int_cast<sal_Int32>(aSize.Height());
+    rStrm.WriteInt32( sal::static_int_cast<sal_Int32>(aSize.Width()) );
+    rStrm.WriteInt32( sal::static_int_cast<sal_Int32>(aSize.Height()) );
     return rStrm;
 }
 
@@ -675,38 +675,38 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con
     sal_uInt16 nMargin = 0;
     if( nLeftMargin > 0 )
         nMargin = sal_uInt16( nLeftMargin );
-    rStrm << nMargin;
-    rStrm << nPropLeftMargin;
+    rStrm.WriteUInt16( nMargin );
+    rStrm.WriteUInt16( nPropLeftMargin );
     if( nRightMargin > 0 )
         nMargin = sal_uInt16( nRightMargin );
     else
         nMargin = 0;
-    rStrm << nMargin;
-    rStrm << nPropRightMargin;
-    rStrm << nFirstLineOfst;
-    rStrm << nPropFirstLineOfst;
+    rStrm.WriteUInt16( nMargin );
+    rStrm.WriteUInt16( nPropRightMargin );
+    rStrm.WriteInt16( nFirstLineOfst );
+    rStrm.WriteUInt16( nPropFirstLineOfst );
     if( nTxtLeft > 0 )
         nMargin = sal_uInt16( nTxtLeft );
     else
         nMargin = 0;
-    rStrm << nMargin;
+    rStrm.WriteUInt16( nMargin );
     if( nItemVersion >= LRSPACE_AUTOFIRST_VERSION )
     {
         sal_Int8 nAutoFirst = bAutoFirst ? 1 : 0;
         if( nItemVersion >= LRSPACE_NEGATIVE_VERSION &&
             ( nLeftMargin < 0 || nRightMargin < 0 || nTxtLeft < 0 ) )
             nAutoFirst |= 0x80;
-        rStrm << nAutoFirst;
+        rStrm.WriteSChar( nAutoFirst );
 
         // From 6.0 onwards, do not write Magic numbers...
         DBG_ASSERT( rStrm.GetVersion() <= SOFFICE_FILEFORMAT_50, "Change File format SvxLRSpaceItem!" );
-        rStrm << (sal_uInt32) BULLETLR_MARKER;
-        rStrm << nSaveFI;
+        rStrm.WriteUInt32( (sal_uInt32) BULLETLR_MARKER );
+        rStrm.WriteInt16( nSaveFI );
 
         if( 0x80 & nAutoFirst )
         {
-            rStrm << static_cast<sal_Int32>(nLeftMargin);
-            rStrm << static_cast<sal_Int32>(nRightMargin);
+            rStrm.WriteInt32( static_cast<sal_Int32>(nLeftMargin) );
+            rStrm.WriteInt32( static_cast<sal_Int32>(nRightMargin) );
         }
     }
 
@@ -1002,10 +1002,10 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
 
 SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << GetUpper()
-          << GetPropUpper()
-          << GetLower()
-          << GetPropLower();
+    rStrm.WriteUInt16( GetUpper() )
+         .WriteUInt16( GetPropUpper() )
+         .WriteUInt16( GetLower() )
+         .WriteUInt16( GetPropLower() );
     return rStrm;
 }
 
@@ -1067,7 +1067,7 @@ SfxPoolItem* SvxPrintItem::Clone( SfxItemPool* ) const
 
 SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Int8)GetValue();
+    rStrm.WriteSChar( (sal_Int8)GetValue() );
     return rStrm;
 }
 
@@ -1122,7 +1122,7 @@ SfxPoolItem* SvxOpaqueItem::Clone( SfxItemPool* ) const
 
 SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Int8)GetValue();
+    rStrm.WriteSChar( (sal_Int8)GetValue() );
     return rStrm;
 }
 
@@ -1267,7 +1267,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     if( IsPosProtected() )   cProt |= 0x01;
     if( IsSizeProtected() )  cProt |= 0x02;
     if( IsCntntProtected() ) cProt |= 0x04;
-    rStrm << (sal_Int8) cProt;
+    rStrm.WriteSChar( (sal_Int8) cProt );
     return rStrm;
 }
 
@@ -1510,12 +1510,12 @@ SfxItemPresentation SvxShadowItem::GetPresentation
 
 SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Int8) GetLocation()
-          << (sal_uInt16) GetWidth()
-          << (sal_Bool)(aShadowColor.GetTransparency() > 0)
+    rStrm.WriteSChar( (sal_Int8) GetLocation() )
+         .WriteUInt16( (sal_uInt16) GetWidth() )
+         .WriteUChar( (sal_Bool)(aShadowColor.GetTransparency() > 0) )
           << GetColor()
-          << GetColor()
-          << (sal_Int8)(aShadowColor.GetTransparency() > 0 ? 0 : 1); //BRUSH_NULL : BRUSH_SOLID
+          << GetColor();
+    rStrm.WriteSChar( (sal_Int8)(aShadowColor.GetTransparency() > 0 ? 0 : 1) ); //BRUSH_NULL : BRUSH_SOLID
     return rStrm;
 }
 
@@ -2200,7 +2200,7 @@ SfxItemPresentation SvxBoxItem::GetPresentation
 
 SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
-    rStrm << (sal_uInt16) GetDistance();
+    rStrm.WriteUInt16( (sal_uInt16) GetDistance() );
     const SvxBorderLine* pLine[ 4 ];    // top, left, right, bottom
     pLine[ 0 ] = GetTop();
     pLine[ 1 ] = GetLeft();
@@ -2212,7 +2212,7 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
         const SvxBorderLine* l = pLine[ i ];
         if( l )
         {
-            rStrm << static_cast<sal_Int8>(i);
+            rStrm.WriteSChar( static_cast<sal_Int8>(i) );
             StoreBorderLine(rStrm, *l, BorderLineVersionFromBoxVersion(nItemVersion));
         }
     }
@@ -2225,14 +2225,14 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
         cLine |= 0x10;
     }
 
-    rStrm << cLine;
+    rStrm.WriteSChar( cLine );
 
     if( nItemVersion >= BOX_4DISTS_VERSION && (cLine & 0x10) != 0 )
     {
-        rStrm << (sal_uInt16)nTopDist
-              << (sal_uInt16)nLeftDist
-              << (sal_uInt16)nRightDist
-              << (sal_uInt16)nBottomDist;
+        rStrm.WriteUInt16( (sal_uInt16)nTopDist )
+             .WriteUInt16( (sal_uInt16)nLeftDist )
+             .WriteUInt16( (sal_uInt16)nRightDist )
+             .WriteUInt16( (sal_uInt16)nBottomDist );
     }
 
     return rStrm;
@@ -2601,8 +2601,8 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
         cFlags |= 0x02;
     if ( IsMinDist() )
         cFlags |= 0x04;
-    rStrm << (sal_Int8)   cFlags
-          << (sal_uInt16) GetDefDist();
+    rStrm.WriteSChar( (sal_Int8)   cFlags )
+         .WriteUInt16( (sal_uInt16) GetDefDist() );
     const SvxBorderLine* pLine[ 2 ];
     pLine[ 0 ] = GetHori();
     pLine[ 1 ] = GetVert();
@@ -2612,14 +2612,14 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
         const SvxBorderLine* l = pLine[ i ];
         if( l )
         {
-            rStrm << (char) i
-                  << l->GetColor()
-                  << (short) l->GetOutWidth()
-                  << (short) l->GetInWidth()
-                  << (short) l->GetDistance();
+            rStrm.WriteChar( (char) i )
+                  << l->GetColor();
+            rStrm.WriteInt16( (short) l->GetOutWidth() )
+                 .WriteInt16( (short) l->GetInWidth() )
+                 .WriteInt16( (short) l->GetDistance() );
         }
     }
-    rStrm << (char) 2;
+    rStrm.WriteChar( (char) 2 );
     return rStrm;
 }
 
@@ -3012,9 +3012,9 @@ SfxPoolItem* SvxFmtBreakItem::Clone( SfxItemPool* ) const
 
 SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
-    rStrm << (sal_Int8)GetValue();
+    rStrm.WriteSChar( (sal_Int8)GetValue() );
     if( FMTBREAK_NOAUTO > nItemVersion )
-        rStrm << (sal_Int8)0x01;
+        rStrm.WriteSChar( (sal_Int8)0x01 );
     return rStrm;
 }
 
@@ -3059,7 +3059,7 @@ SfxPoolItem* SvxFmtKeepItem::Clone( SfxItemPool* ) const
 
 SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Int8)GetValue();
+    rStrm.WriteSChar( (sal_Int8)GetValue() );
     return rStrm;
 }
 
@@ -3257,13 +3257,16 @@ SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
 {
     if( pLine )
     {
-        rStrm << pLine->GetColor()
-              << (short)pLine->GetOutWidth()
-              << (short)pLine->GetInWidth()
-              << (short)pLine->GetDistance();
+        rStrm << pLine->GetColor();
+        rStrm.WriteInt16( (short)pLine->GetOutWidth() )
+             .WriteInt16( (short)pLine->GetInWidth() )
+             .WriteInt16( (short)pLine->GetDistance() );
     }
     else
-        rStrm << Color() << (short)0 << (short)0 << (short)0;
+    {
+        rStrm << Color();
+        rStrm.WriteInt16( (short)0 ).WriteInt16( (short)0 ).WriteInt16( (short)0 );
+    }
     return rStrm;
 }
 
@@ -3897,10 +3900,10 @@ SfxPoolItem* SvxBrushItem::Create( SvStream& rStream, sal_uInt16 nVersion ) cons
 
 SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStream << (sal_Bool)sal_False;
+    rStream.WriteUChar( (sal_Bool)sal_False );
     rStream << aColor;
     rStream << aColor;
-    rStream << (sal_Int8)(aColor.GetTransparency() > 0 ? 0 : 1); //BRUSH_NULL : BRUSH_SOLID
+    rStream.WriteSChar( (sal_Int8)(aColor.GetTransparency() > 0 ? 0 : 1) ); //BRUSH_NULL : BRUSH_SOLID
 
     sal_uInt16 nDoLoad = 0;
 
@@ -3910,7 +3913,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
         nDoLoad |= LOAD_LINK;
     if ( !maStrFilter.isEmpty() )
         nDoLoad |= LOAD_FILTER;
-    rStream << nDoLoad;
+    rStream.WriteUInt16( nDoLoad );
 
     if ( pImpl->pGraphicObject && maStrLink.isEmpty() )
         rStream << pImpl->pGraphicObject->GetGraphic();
@@ -3927,7 +3930,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
         // UNICODE: rStream << maStrFilter;
         rStream.WriteUniOrByteString(maStrFilter, rStream.GetStreamCharSet());
     }
-    rStream << (sal_Int8)eGraphicPos;
+    rStream.WriteSChar( (sal_Int8)eGraphicPos );
     return rStream;
 }
 
@@ -4185,7 +4188,7 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*
 SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, sal_uInt16 /*nIVer*/ ) const
 {
     sal_uInt16 nValue = GetValue();
-    rStrm << nValue;
+    rStrm.WriteUInt16( nValue );
     return rStrm;
 }
 
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 2dca4a74d332..08f0a63cd7b6 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -245,26 +245,26 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
         pBulletFont->SetName(sFontName);
     }
 
-    rStream << (sal_uInt16)NUMITEM_VERSION_04;
+    rStream.WriteUInt16( (sal_uInt16)NUMITEM_VERSION_04 );
 
-    rStream << (sal_uInt16)GetNumberingType();
-    rStream << (sal_uInt16)eNumAdjust;
-    rStream << (sal_uInt16)nInclUpperLevels;
-    rStream << nStart;
-    rStream << (sal_uInt16)cBullet;
+    rStream.WriteUInt16( (sal_uInt16)GetNumberingType() );
+    rStream.WriteUInt16( (sal_uInt16)eNumAdjust );
+    rStream.WriteUInt16( (sal_uInt16)nInclUpperLevels );
+    rStream.WriteUInt16( nStart );
+    rStream.WriteUInt16( (sal_uInt16)cBullet );
 
-    rStream << nFirstLineOffset;
-    rStream << nAbsLSpace;
-    rStream << nLSpace;
+    rStream.WriteInt16( nFirstLineOffset );
+    rStream.WriteInt16( nAbsLSpace );
+    rStream.WriteInt16( nLSpace );
 
-    rStream << nCharTextDistance;
+    rStream.WriteInt16( nCharTextDistance );
     rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
     rStream.WriteUniOrByteString(sPrefix, eEnc);
     rStream.WriteUniOrByteString(sSuffix, eEnc);
     rStream.WriteUniOrByteString(sCharStyleName, eEnc);
     if(pGraphicBrush)
     {
-        rStream << (sal_uInt16)1;
+        rStream.WriteUInt16( (sal_uInt16)1 );
 
         // in SD or SI force bullet itself to be stored,
         // for that purpose throw away link when link and graphic
@@ -277,30 +277,30 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
         pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
     }
     else
-        rStream << (sal_uInt16)0;
+        rStream.WriteUInt16( (sal_uInt16)0 );
 
-    rStream << (sal_uInt16)eVertOrient;
+    rStream.WriteUInt16( (sal_uInt16)eVertOrient );
     if(pBulletFont)
     {
-        rStream << (sal_uInt16)1;
+        rStream.WriteUInt16( (sal_uInt16)1 );
         rStream << *pBulletFont;
     }
     else
-        rStream << (sal_uInt16)0;
+        rStream.WriteUInt16( (sal_uInt16)0 );
     rStream << aGraphicSize;
 
     Color nTempColor = nBulletColor;
     if(COL_AUTO == nBulletColor.GetColor())
         nTempColor = COL_BLACK;
     rStream << nTempColor;
-    rStream << nBulletRelSize;
-    rStream << (sal_uInt16)IsShowSymbol();
+    rStream.WriteUInt16( nBulletRelSize );
+    rStream.WriteUInt16( (sal_uInt16)IsShowSymbol() );
 
-    rStream << ( sal_uInt16 ) mePositionAndSpaceMode;
-    rStream << ( sal_uInt16 ) meLabelFollowedBy;
-    rStream << ( sal_Int32 ) mnListtabPos;
-    rStream << ( sal_Int32 ) mnFirstLineIndent;
-    rStream << ( sal_Int32 ) mnIndentAt;
+    rStream.WriteUInt16( ( sal_uInt16 ) mePositionAndSpaceMode );
+    rStream.WriteUInt16( ( sal_uInt16 ) meLabelFollowedBy );
+    rStream.WriteInt32( ( sal_Int32 ) mnListtabPos );
+    rStream.WriteInt32( ( sal_Int32 ) mnFirstLineIndent );
+    rStream.WriteInt32( ( sal_Int32 ) mnIndentAt );
 
     return rStream;
 }
@@ -710,12 +710,12 @@ SvxNumRule* SvxNumRule::Create( SvStream & rStream )
 
 SvStream& SvxNumRule::Store( SvStream &rStream )
 {
-    rStream<<(sal_uInt16)NUMITEM_VERSION_03;
-    rStream<<nLevelCount;
+    rStream.WriteUInt16( (sal_uInt16)NUMITEM_VERSION_03 );
+    rStream.WriteUInt16( nLevelCount );
     //first save of nFeatureFlags for old versions
-    rStream<<(sal_uInt16)nFeatureFlags;
-    rStream<<(sal_uInt16)bContinuousNumbering;
-    rStream<<(sal_uInt16)eNumberingType;
+    rStream.WriteUInt16( (sal_uInt16)nFeatureFlags );
+    rStream.WriteUInt16( (sal_uInt16)bContinuousNumbering );
+    rStream.WriteUInt16( (sal_uInt16)eNumberingType );
 
     FontToSubsFontConverter pConverter = 0;
     sal_Bool bConvertBulletFont = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_50 ) && ( rStream.GetVersion() );
@@ -724,7 +724,7 @@ SvStream& SvxNumRule::Store( SvStream &rStream )
         sal_uInt16 nSetFlag(aFmtsSet[i] ? 2 : 0); // fdo#68648 store that too
         if(aFmts[i])
         {
-            rStream << sal_uInt16(1 | nSetFlag);
+            rStream.WriteUInt16( sal_uInt16(1 | nSetFlag) );
             if(bConvertBulletFont && aFmts[i]->GetBulletFont())
             {
                 if(!pConverter)
@@ -735,10 +735,10 @@ SvStream& SvxNumRule::Store( SvStream &rStream )
             aFmts[i]->Store(rStream, pConverter);
         }
         else
-            rStream << sal_uInt16(0 | nSetFlag);
+            rStream.WriteUInt16( sal_uInt16(0 | nSetFlag) );
     }
     //second save of nFeatureFlags for new versions
-    rStream<<(sal_uInt16)nFeatureFlags;
+    rStream.WriteUInt16( (sal_uInt16)nFeatureFlags );
     if(pConverter)
         DestroyFontToSubsFontConverter(pConverter);
 
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index c3f315ed2791..53f92281686f 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -182,8 +182,8 @@ SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const
 
 SvStream& SfxHyphenRegionItem::Store( SvStream& rStrm, sal_uInt16 ) const
 {
-    rStrm << (sal_uInt8) GetMinLead()
-          << (sal_uInt8) GetMinTrail();
+    rStrm.WriteUChar( (sal_uInt8) GetMinLead() )
+         .WriteUChar( (sal_uInt8) GetMinTrail() );
     return rStrm;
 }
 
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 5f11920eb39b..747664150799 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -278,11 +278,11 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const
 
 SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Int8)  GetPropLineSpace()
-          << (short)  GetInterLineSpace()
-          << (sal_uInt16) GetLineHeight()
-          << (sal_Int8)   GetLineSpaceRule()
-          << (sal_Int8)   GetInterLineSpaceRule();
+    rStrm.WriteSChar( (sal_Int8)  GetPropLineSpace() )
+         .WriteInt16( (short)  GetInterLineSpace() )
+         .WriteUInt16( (sal_uInt16) GetLineHeight() )
+         .WriteSChar( (sal_Int8)   GetLineSpaceRule() )
+         .WriteSChar( (sal_Int8)   GetInterLineSpaceRule() );
     return rStrm;
 }
 
@@ -509,7 +509,7 @@ SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const
 
 SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
 {
-    rStrm << (char)GetAdjust();
+    rStrm.WriteChar( (char)GetAdjust() );
     if ( nItemVersion >= ADJUST_LASTBLOCK_VERSION )
     {
         sal_Int8 nFlags = 0;
@@ -519,7 +519,7 @@ SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
             nFlags |= 0x0002;
         if ( bLastBlock )
             nFlags |= 0x0004;
-        rStrm << (sal_Int8) nFlags;
+        rStrm.WriteSChar( (sal_Int8) nFlags );
     }
     return rStrm;
 }
@@ -551,7 +551,7 @@ SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const
 
 SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Int8)GetValue();
+    rStrm.WriteSChar( (sal_Int8)GetValue() );
     return rStrm;
 }
 
@@ -621,7 +621,7 @@ SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const
 
 SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Int8) GetValue();
+    rStrm.WriteSChar( (sal_Int8) GetValue() );
     return rStrm;
 }
 
@@ -823,11 +823,11 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const
 
 SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Int8) IsHyphen()
-          << (sal_Int8) IsPageEnd()
-          << (sal_Int8) GetMinLead()
-          << (sal_Int8) GetMinTrail()
-          << (sal_Int8) GetMaxHyphens();
+    rStrm.WriteSChar( (sal_Int8) IsHyphen() )
+         .WriteSChar( (sal_Int8) IsPageEnd() )
+         .WriteSChar( (sal_Int8) GetMinLead() )
+         .WriteSChar( (sal_Int8) GetMinTrail() )
+         .WriteSChar( (sal_Int8) GetMaxHyphens() );
     return rStrm;
 }
 
@@ -1187,24 +1187,24 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
         nCount = (sal_uInt16)(nNew < lA3Width ? ( lA3Width - nNew ) / nDefDist + 1 : 0);
     }
 
-    rStrm << (sal_Int8) ( nTabs + nCount );
+    rStrm.WriteSChar( (sal_Int8) ( nTabs + nCount ) );
     for ( short i = 0; i < nTabs; i++ )
     {
         const SvxTabStop& rTab = (*this)[ i ];
-        rStrm << rTab.GetTabPos()
-              << (sal_Int8) rTab.GetAdjustment()
-              << (unsigned char) rTab.GetDecimal()
-              << (unsigned char) rTab.GetFill();
+        rStrm.WriteInt32( rTab.GetTabPos() )
+             .WriteSChar( (sal_Int8) rTab.GetAdjustment() )
+             .WriteUChar( (unsigned char) rTab.GetDecimal() )
+             .WriteUChar( (unsigned char) rTab.GetFill() );
     }
 
     if ( bStoreDefTabs )
         for( ; nCount; --nCount )
         {
             SvxTabStop aSwTabStop(nNew, SVX_TAB_ADJUST_DEFAULT);
-            rStrm << aSwTabStop.GetTabPos()
-                  << (sal_Int8) aSwTabStop.GetAdjustment()
-                  << (unsigned char) aSwTabStop.GetDecimal()
-                  << (unsigned char) aSwTabStop.GetFill();
+            rStrm.WriteInt32( aSwTabStop.GetTabPos() )
+                 .WriteSChar( (sal_Int8) aSwTabStop.GetAdjustment() )
+                 .WriteUChar( (unsigned char) aSwTabStop.GetDecimal() )
+                 .WriteUChar( (unsigned char) aSwTabStop.GetFill() );
             nNew += nDefDist;
         }
 
@@ -1252,7 +1252,7 @@ SfxPoolItem* SvxFmtSplitItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Int8)GetValue();
+    rStrm.WriteSChar( (sal_Int8)GetValue() );
     return rStrm;
 }
 
@@ -1548,7 +1548,7 @@ SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, sal_uInt16 ) const
 
 SvStream& SvxParaVertAlignItem::Store( SvStream & rStrm, sal_uInt16 ) const
 {
-    rStrm << GetValue();
+    rStrm.WriteUInt16( GetValue() );
     return rStrm;
 }
 
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index 07742bc1a1a4..4ec1280ce5f9 100644
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -45,7 +45,7 @@ void SdrMeasureField::Load(SvPersistStream& rIn)
 
 void SdrMeasureField::Save(SvPersistStream& rOut)
 {
-    rOut<<(sal_uInt16)eMeasureFieldKind;
+    rOut.WriteUInt16( (sal_uInt16)eMeasureFieldKind );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index eb304063a875..7352f575e1f3 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -375,8 +375,8 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
 {
     sal_Bool bToBats = IsStarSymbol( GetFamilyName() );
 
-    rStrm << (sal_uInt8) GetFamily() << (sal_uInt8) GetPitch()
-          << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet()));
+    rStrm.WriteUChar( (sal_uInt8) GetFamily() ).WriteUChar( (sal_uInt8) GetPitch() )
+         .WriteUChar( (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet())) );
 
     OUString aStoreFamilyName( GetFamilyName() );
     if( bToBats )
@@ -388,7 +388,7 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
     if ( bEnableStoreUnicodeNames )
     {
         sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER;
-        rStrm << nMagic;
+        rStrm.WriteUInt32( nMagic );
         rStrm.WriteUniOrByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE );
         rStrm.WriteUniOrByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE );
     }
@@ -495,7 +495,7 @@ sal_uInt16 SvxPostureItem::GetValueCount() const
 
 SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt8)GetValue();
+    rStrm.WriteUChar( (sal_uInt8)GetValue() );
     return rStrm;
 }
 
@@ -660,7 +660,7 @@ SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt8)GetValue();
+    rStrm.WriteUChar( (sal_uInt8)GetValue() );
     return rStrm;
 }
 
@@ -768,10 +768,10 @@ SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
-    rStrm << (sal_uInt16)GetHeight();
+    rStrm.WriteUInt16( (sal_uInt16)GetHeight() );
 
     if( FONTHEIGHT_UNIT_VERSION <= nItemVersion )
-        rStrm << GetProp() << (sal_uInt16)GetPropUnit();
+        rStrm.WriteUInt16( GetProp() ).WriteUInt16( (sal_uInt16)GetPropUnit() );
     else
     {
         // When exporting to the old versions the relative information is lost
@@ -779,7 +779,7 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion )
         sal_uInt16 _nProp = GetProp();
         if( SFX_MAPUNIT_RELATIVE != GetPropUnit() )
             _nProp = 100;
-        rStrm << _nProp;
+        rStrm.WriteUInt16( _nProp );
     }
     return rStrm;
 }
@@ -1157,7 +1157,7 @@ SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << GetWidth() << GetProp();
+    rStrm.WriteUInt16( GetWidth() ).WriteUInt16( GetProp() );
     return rStrm;
 }
 
@@ -1317,7 +1317,7 @@ sal_uInt16 SvxTextLineItem::GetValueCount() const
 
 SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt8)GetValue();
+    rStrm.WriteUChar( (sal_uInt8)GetValue() );
     return rStrm;
 }
 
@@ -1545,7 +1545,7 @@ SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt8)GetValue();
+    rStrm.WriteUChar( (sal_uInt8)GetValue() );
     return rStrm;
 }
 
@@ -1642,7 +1642,7 @@ SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt8) GetValue();
+    rStrm.WriteUChar( (sal_uInt8) GetValue() );
     return rStrm;
 }
 
@@ -1703,7 +1703,7 @@ SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt8) GetValue();
+    rStrm.WriteUChar( (sal_uInt8) GetValue() );
     return rStrm;
 }
 
@@ -1765,7 +1765,7 @@ SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Bool) GetValue();
+    rStrm.WriteUChar( (sal_Bool) GetValue() );
     return rStrm;
 }
 
@@ -1826,7 +1826,7 @@ SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Bool) GetValue();
+    rStrm.WriteUChar( (sal_Bool) GetValue() );
     return rStrm;
 }
 
@@ -1887,7 +1887,7 @@ SfxPoolItem* SvxPropSizeItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt16) GetValue();
+    rStrm.WriteUInt16( (sal_uInt16) GetValue() );
     return rStrm;
 }
 
@@ -2082,7 +2082,7 @@ SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt8)GetSOStoreTextEncoding(GetCharSet()) << GetValue();
+    rStrm.WriteUChar( (sal_uInt8)GetSOStoreTextEncoding(GetCharSet()) ) << GetValue();
     return rStrm;
 }
 
@@ -2128,7 +2128,7 @@ SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (short) GetValue();
+    rStrm.WriteInt16( (short) GetValue() );
     return rStrm;
 }
 
@@ -2242,7 +2242,7 @@ SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt8) GetValue();
+    rStrm.WriteUChar( (sal_uInt8) GetValue() );
     return rStrm;
 }
 
@@ -2381,8 +2381,8 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*
         else if( DFLT_ESC_AUTO_SUB == _nEsc )
             _nEsc = DFLT_ESC_SUB;
     }
-    rStrm << (sal_uInt8) GetProp()
-          << (short) _nEsc;
+    rStrm.WriteUChar( (sal_uInt8) GetProp() )
+         .WriteInt16( (short) _nEsc );
     return rStrm;
 }
 
@@ -2555,7 +2555,7 @@ SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt16) GetValue();
+    rStrm.WriteUInt16( (sal_uInt16) GetValue() );
     return rStrm;
 }
 
@@ -2655,7 +2655,7 @@ SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const
 
 SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Bool)GetValue();
+    rStrm.WriteUChar( (sal_Bool)GetValue() );
     return rStrm;
 }
 
@@ -2700,7 +2700,7 @@ SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const
 
 SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_Bool) GetValue();
+    rStrm.WriteUChar( (sal_Bool) GetValue() );
     return rStrm;
 }
 
@@ -2788,7 +2788,7 @@ SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt8) GetValue();
+    rStrm.WriteUChar( (sal_uInt8) GetValue() );
     return rStrm;
 }
 
@@ -2851,7 +2851,7 @@ SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const
 SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
                                      sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (sal_uInt16)GetValue();
+    rStrm.WriteUInt16( (sal_uInt16)GetValue() );
     return rStrm;
 }
 
@@ -3108,7 +3108,7 @@ SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/) con
 
 SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const
 {
-    rStrm << GetValue() << GetStartBracket() << GetEndBracket();
+    rStrm.WriteUChar( GetValue() ).WriteUInt16( GetStartBracket() ).WriteUInt16( GetEndBracket() );
     return rStrm;
 }
 
@@ -3150,7 +3150,7 @@ SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, sal_uInt16 ) const
 SvStream& SvxCharRotateItem::Store( SvStream & rStrm, sal_uInt16 ) const
 {
     sal_Bool bFlag = IsFitToLine();
-    rStrm << GetValue() << bFlag;
+    rStrm.WriteUInt16( GetValue() ).WriteUChar( bFlag );
     return rStrm;
 }
 
@@ -3288,10 +3288,10 @@ SvStream& SvxCharScaleWidthItem::Store( SvStream& rStream, sal_uInt16 nVer ) con
     {
         // see comment in Create()....
         rRet.SeekRel( -1*(long)sizeof(sal_uInt16) );
-        rRet << (sal_uInt16)0;
-        rRet << GetValue();
+        rRet.WriteUInt16( (sal_uInt16)0 );
+        rRet.WriteUInt16( GetValue() );
         // Really ugly, but not a problem for reading the doc in 5.2
-        rRet << (sal_uInt16)0x1234;
+        rRet.WriteUInt16( (sal_uInt16)0x1234 );
     }
     return rRet;
 }
@@ -3378,7 +3378,7 @@ SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, sal_uInt16) const
 SvStream& SvxCharReliefItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const
 {
     sal_uInt16 nVal = GetValue();
-    rStrm << nVal;
+    rStrm.WriteUInt16( nVal );
     return rStrm;
 }