convert specialised SvStream::operator>> methods to ReadXXX methods

as preparation for converting the SvStream::operator>> methods on
primitive types

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

5 files changed, 11 insertions, 11 deletions

diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index ab0c4920cacb..9eddbc9eb619 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -63,7 +63,7 @@ FileList& FileList::operator=( const FileList& rFileList )
 
 void FileList::Load( SvStream& rIStm )
 {
-    rIStm >> *this;
+    ReadFileList( rIStm, *this );
 }
 
 void FileList::Save( SvStream& rOStm )
@@ -99,7 +99,7 @@ SvStream& WriteFileList( SvStream& rOStm, SAL_UNUSED_PARAMETER const FileList& )
    instead of the original Windows Sv_DROPFILES structure. All strings
    in this list are UTF16 strings. Shell link files will be already
    resolved by the Windows clipboard bridge.*/
-SvStream& operator>>( SvStream& rIStm, FileList& rFileList )
+SvStream& ReadFileList( SvStream& rIStm, FileList& rFileList )
 {
     rFileList.ClearAll();
 
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 5ce1548ebb0d..46d43c210da7 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1429,7 +1429,7 @@ static sal_uInt16 GetTransferableAction_Impl(
                                 SvMemoryStream          aMemStm( (void*) aSeq.getConstArray(), aSeq.getLength(), STREAM_READ );
                                 FileList                aFileList;
 
-                                aMemStm >> aFileList;
+                                ReadFileList( aMemStm, aFileList );
 
                                 if( !aMemStm.GetError() && ( aFileList.Count() == 1 ) )
                                 {
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index a2e1718639a4..0ac6bae0988f 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -35,7 +35,7 @@ static const sal_uInt8 cStgSignature[ 8 ] = { 0xD0,0xCF,0x11,0xE0,0xA1,0xB1,0x1A
 
 ////////////////////////////// struct ClsId  /////////////////////////////
 
-SvStream& operator >>( SvStream& r, ClsId& rId )
+SvStream& ReadClsId( SvStream& r, ClsId& rId )
 {
     r >> rId.n1
       >> rId.n2
@@ -131,8 +131,8 @@ bool StgHeader::Load( SvStream& r )
 {
     r.Seek( 0L );
     r.Read( cSignature, 8 );
-    r >> aClsId                     // 08 Class ID
-      >> nVersion                   // 1A version number
+    ReadClsId( r, aClsId );         // 08 Class ID
+    r >> nVersion                   // 1A version number
       >> nByteOrder                 // 1C Unicode byte order indicator
       >> nPageSize                  // 1E 1 << nPageSize = block size
       >> nDataPageSize;             // 20 1 << this size == data block size
@@ -380,9 +380,9 @@ bool StgEntry::Load( const void* pFrom, sal_uInt32 nBufSize )
       >> 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(?)
+      >> nChild;                    // 4C 1st child entry if storage
+    ReadClsId( r, aClsId );         // 50 class ID (optional)
+    r >> nFlags                     // 60 state flags(?)
       >> nMtime[ 0 ]                // 64 modification time
       >> nMtime[ 1 ]                // 64 modification time
       >> nAtime[ 0 ]                // 6C creation and access time
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 8598efc175b6..a00658634ca6 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -28,7 +28,7 @@
 class StgIo;
 class SvStream;
 
-SvStream& operator>>( SvStream&, ClsId& );
+SvStream& ReadClsId( SvStream&, ClsId& );
 SvStream& WriteClsId( SvStream&, const ClsId& );
 
 class StgHeader
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 0f87b5411983..3bae8d637d33 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -109,7 +109,7 @@ bool StgCompObjStream::Load()
     *this >> nMarker;
     if( nMarker == -1L )
     {
-        *this >> aClsId;
+        ReadClsId( *this, aClsId );
         sal_Int32 nLen1 = 0;
         *this >> nLen1;
         if ( nLen1 > 0 )