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>

5 files changed, 64 insertions, 64 deletions

diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 4299994acc72..46083e0ee462 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -54,17 +54,17 @@ SvStream& operator >>( SvStream& r, ClsId& rId )
 SvStream& operator <<( SvStream& r, const ClsId& rId )
 {
     return
-       r  << (sal_Int32) rId.n1
-          << (sal_Int16) rId.n2
-          << (sal_Int16) rId.n3
-          << (sal_uInt8) rId.n4
-          << (sal_uInt8) rId.n5
-          << (sal_uInt8) rId.n6
-          << (sal_uInt8) rId.n7
-          << (sal_uInt8) rId.n8
-          << (sal_uInt8) rId.n9
-          << (sal_uInt8) rId.n10
-          << (sal_uInt8) rId.n11;
+       r .WriteInt32( (sal_Int32) rId.n1 )
+         .WriteInt16( (sal_Int16) rId.n2 )
+         .WriteInt16( (sal_Int16) rId.n3 )
+         .WriteUChar( (sal_uInt8) rId.n4 )
+         .WriteUChar( (sal_uInt8) rId.n5 )
+         .WriteUChar( (sal_uInt8) rId.n6 )
+         .WriteUChar( (sal_uInt8) rId.n7 )
+         .WriteUChar( (sal_uInt8) rId.n8 )
+         .WriteUChar( (sal_uInt8) rId.n9 )
+         .WriteUChar( (sal_uInt8) rId.n10 )
+         .WriteUChar( (sal_uInt8) rId.n11 );
 }
 
 ///////////////////////////// class StgHeader ////////////////////////////
@@ -159,22 +159,22 @@ bool StgHeader::Store( StgIo& rIo )
     SvStream& r = *rIo.GetStrm();
     r.Seek( 0L );
     r.Write( cSignature, 8 );
-    r << aClsId                     // 08 Class ID
-      << nVersion                   // 1A version number
-      << nByteOrder                 // 1C Unicode byte order indicator
-      << nPageSize                  // 1E 1 << nPageSize = block size
-      << nDataPageSize              // 20 1 << this size == data block size
-      << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int16) 0
-      << nFATSize                   // 2C total number of FAT pages
-      << nTOCstrm                   // 30 starting page for the TOC stream
-      << nReserved                  // 34
-      << nThreshold                 // 38 minimum file size for big data
-      << nDataFAT                   // 3C page # of 1st data FAT block
-      << nDataFATSize               // 40 # of data FAT pages
-      << nMasterChain               // 44 chain to the next master block
-      << nMaster;                   // 48 # of additional master blocks
+    r << aClsId;                     // 08 Class ID
+    r.WriteInt32( nVersion )                   // 1A version number
+     .WriteUInt16( nByteOrder )                 // 1C Unicode byte order indicator
+     .WriteInt16( nPageSize )                  // 1E 1 << nPageSize = block size
+     .WriteInt16( nDataPageSize )              // 20 1 << this size == data block size
+     .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt16( (sal_Int16) 0 )
+     .WriteInt32( nFATSize )                   // 2C total number of FAT pages
+     .WriteInt32( nTOCstrm )                   // 30 starting page for the TOC stream
+     .WriteInt32( nReserved )                  // 34
+     .WriteInt32( nThreshold )                 // 38 minimum file size for big data
+     .WriteInt32( nDataFAT )                   // 3C page # of 1st data FAT block
+     .WriteInt32( nDataFATSize )               // 40 # of data FAT pages
+     .WriteInt32( nMasterChain )               // 44 chain to the next master block
+     .WriteInt32( nMaster );                   // 48 # of additional master blocks
     for( short i = 0; i < cFATPagesInHeader; i++ )
-        r << nMasterFAT[ i ];
+        r.WriteInt32( nMasterFAT[ i ] );
     bDirty = !rIo.Good();
     return !bDirty;
 }
@@ -420,22 +420,22 @@ void StgEntry::Store( void* pTo )
 {
     SvMemoryStream r( (sal_Char *)pTo, 128, STREAM_WRITE );
     for( short i = 0; i < 32; i++ )
-        r << nName[ i ];            // 00 name as WCHAR
-    r << nNameLen                   // 40 size of name in bytes including 00H
-      << cType                      // 42 entry type
-      << cFlags                     // 43 0 or 1 (tree balance?)
-      << nLeft                      // 44 left node entry
-      << nRight                     // 48 right node entry
-      << nChild                     // 4C 1st child entry if storage;
-      << aClsId                     // 50 class ID (optional)
-      << nFlags                     // 60 state flags(?)
-      << nMtime[ 0 ]                // 64 modification time
-      << nMtime[ 1 ]                // 64 modification time
-      << nAtime[ 0 ]                // 6C creation and access time
-      << nAtime[ 1 ]                // 6C creation and access time
-      << nPage1                     // 74 starting block (either direct or translated)
-      << nSize                      // 78 file size
-      << nUnknown;                  // 7C unknown
+        r.WriteUInt16( nName[ i ] );            // 00 name as WCHAR
+    r.WriteUInt16( nNameLen )                   // 40 size of name in bytes including 00H
+     .WriteUChar( cType )                      // 42 entry type
+     .WriteUChar( cFlags )                     // 43 0 or 1 (tree balance?)
+     .WriteInt32( nLeft )                      // 44 left node entry
+     .WriteInt32( nRight )                     // 48 right node entry
+     .WriteInt32( nChild );                    // 4C 1st child entry if storage;
+    r << aClsId;                               // 50 class ID (optional)
+    r.WriteInt32( nFlags )                     // 60 state flags(?)
+     .WriteInt32( nMtime[ 0 ] )                // 64 modification time
+     .WriteInt32( nMtime[ 1 ] )                // 64 modification time
+     .WriteInt32( nAtime[ 0 ] )                // 6C creation and access time
+     .WriteInt32( nAtime[ 1 ] )                // 6C creation and access time
+     .WriteInt32( nPage1 )                     // 74 starting block (either direct or translated)
+     .WriteInt32( nSize )                      // 78 file size
+     .WriteInt32( nUnknown );                  // 7C unknown
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index c6dc60e056b8..1e83d36deec8 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -144,16 +144,16 @@ bool StgCompObjStream::Store()
         return false;
     Seek( 0L );
     OString aAsciiUserName(OUStringToOString(aUserName, RTL_TEXTENCODING_MS_1252));
-    *this << (sal_Int16) 1          // Version?
-              << (sal_Int16) -2                     // 0xFFFE = Byte Order Indicator
-              << (sal_Int32) 0x0A03         // Windows 3.10
-              << (sal_Int32) -1L
-              << aClsId             // Class ID
-              << (sal_Int32) (aAsciiUserName.getLength() + 1)
-              << (const char *)aAsciiUserName.getStr()
-              << (sal_uInt8) 0;             // string terminator
+    WriteInt16( (sal_Int16) 1 );          // Version?
+    WriteInt16( (sal_Int16) -2 );                     // 0xFFFE = Byte Order Indicator
+    WriteInt32( (sal_Int32) 0x0A03 );         // Windows 3.10
+    WriteInt32( (sal_Int32) -1L );
+    *this << aClsId;             // Class ID
+    WriteInt32( (sal_Int32) (aAsciiUserName.getLength() + 1) );
+    WriteCharPtr( (const char *)aAsciiUserName.getStr() );
+    WriteUChar( (sal_uInt8) 0 );             // string terminator
     WriteClipboardFormat( *this, nCbFormat );
-    *this << (sal_Int32) 0;             // terminator
+    WriteInt32( (sal_Int32) 0 );             // terminator
     Commit();
     return GetError() == SVSTREAM_OK;
 }
@@ -184,11 +184,11 @@ bool StgOleStream::Store()
         return false;
 
     Seek( 0L );
-    *this << (sal_Int32) 0x02000001         // OLE version, format
-          << (sal_Int32) nFlags             // Object flags
-          << (sal_Int32) 0                  // Update Options
-          << (sal_Int32) 0                  // reserved
-          << (sal_Int32) 0;                 // Moniker 1
+    WriteInt32( (sal_Int32) 0x02000001 );         // OLE version, format
+    WriteInt32( (sal_Int32) nFlags );             // Object flags
+    WriteInt32( (sal_Int32) 0 );                  // Update Options
+    WriteInt32( (sal_Int32) 0 );                  // reserved
+    WriteInt32( (sal_Int32) 0 );                 // Moniker 1
     Commit();
     return GetError() == SVSTREAM_OK;
 }
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index d4115e5e4724..29a5daecd70d 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -1241,7 +1241,7 @@ void StgTmpStrm::SetSize( sal_uLong n )
             {
                 sal_uLong nCur = Tell();
                 Seek( nEndOfData - 1 );
-                *this << (sal_uInt8) 0;
+                WriteUChar( (sal_uInt8) 0 );
                 Seek( nCur );
             }
             else
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index bd785d96902d..f412319bfa55 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -73,18 +73,18 @@ void WriteClipboardFormat( SvStream & rStm, sal_uLong nFormat )
     {
         OString aAsciiCbFmt(OUStringToOString(aCbFmt,
                                               RTL_TEXTENCODING_ASCII_US));
-        rStm << (sal_Int32) (aAsciiCbFmt.getLength() + 1);
-        rStm << (const char *)aAsciiCbFmt.getStr();
-        rStm << (sal_uInt8) 0;
+        rStm.WriteInt32( (sal_Int32) (aAsciiCbFmt.getLength() + 1) );
+        rStm.WriteCharPtr( (const char *)aAsciiCbFmt.getStr() );
+        rStm.WriteUChar( (sal_uInt8) 0 );
     }
     else if( nFormat )
     {
-        rStm << (sal_Int32) -1         // for Windows
-             << (sal_Int32) nFormat;
+        rStm.WriteInt32( (sal_Int32) -1 )         // for Windows
+            .WriteInt32( (sal_Int32) nFormat );
     }
     else
     {
-        rStm << (sal_Int32) 0;         // no clipboard format
+        rStm.WriteInt32( (sal_Int32) 0 );         // no clipboard format
     }
 }
 
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 9c431434f15b..800134e3910b 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -3184,7 +3184,7 @@ OUString UCBStorage::CreateLinkFile( const OUString& rName )
     SvStream* pStream = pTempFile->GetStream( STREAM_STD_READWRITE | STREAM_TRUNC );
 
     // write header
-    *pStream << ( sal_uInt32 ) 0x04034b50;
+    pStream->WriteUInt32( ( sal_uInt32 ) 0x04034b50 );
 
     // assemble a new folder name in the destination folder
     INetURLObject aObj( rName );