convert SvStream::operator>> methods to ReadXXX methods

First, I updated the clang rewriter to do the conversion.
Then I lightly hand-tweaked the output for the few places where
the rewriter messed up, mostly when dealing with calls on "this".

Change-Id: I40a6a977959cd97415c678eafc8507de8aa3b1a9
Reviewed-on: https://gerrit.libreoffice.org/7879
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

2 files changed, 9 insertions, 9 deletions

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index aeb5000d68ac..9f74c798efb2 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3320,7 +3320,7 @@ RTLFUNC(EOF)
         if ( pSbStrm->IsText() )
         {
             char cBla;
-            (*pSvStrm) >> cBla; // can we read another character?
+            (*pSvStrm).ReadChar( cBla ); // can we read another character?
             bIsEof = pSvStrm->IsEof();
             if ( !bIsEof )
             {
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index af6ae3deda5e..efbd2da6f1a0 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1097,7 +1097,7 @@ static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
     if( bIsVariant )
     {
         sal_uInt16 nTemp;
-        *pStrm >> nTemp;
+        pStrm->ReadUInt16( nTemp );
         eSrcType = (SbxDataType)nTemp;
     }
 
@@ -1108,7 +1108,7 @@ static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
     case SbxBYTE:
         {
             sal_uInt8 aByte;
-            *pStrm >> aByte;
+            pStrm->ReadUChar( aByte );
 
             if( bBinary && SbiRuntime::isVBAEnabled() && aByte == 1 && pStrm->IsEof() )
             {
@@ -1127,7 +1127,7 @@ static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
     case SbxUINT:
         {
             sal_Int16 aInt;
-            *pStrm >> aInt;
+            pStrm->ReadInt16( aInt );
             rVar.PutInteger( aInt );
         }
         break;
@@ -1136,7 +1136,7 @@ static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
     case SbxULONG:
         {
             sal_Int32 aInt;
-            *pStrm >> aInt;
+            pStrm->ReadInt32( aInt );
             rVar.PutLong( aInt );
         }
         break;
@@ -1144,14 +1144,14 @@ static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
     case SbxSALUINT64:
         {
             sal_uInt32 aInt;
-            *pStrm >> aInt;
+            pStrm->ReadUInt32( aInt );
             rVar.PutInt64( (sal_Int64)aInt );
         }
         break;
     case SbxSINGLE:
         {
             float nS;
-            *pStrm >> nS;
+            pStrm->ReadFloat( nS );
             rVar.PutSingle( nS );
         }
         break;
@@ -1159,14 +1159,14 @@ static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
     case SbxDOUBLE:
     case SbxCURRENCY:
         {
-            *pStrm >> aDouble;
+            pStrm->ReadDouble( aDouble );
             rVar.PutDouble( aDouble );
         }
         break;
 
     case SbxDATE:
         {
-            *pStrm >> aDouble;
+            pStrm->ReadDouble( aDouble );
             rVar.PutDate( aDouble );
         }
         break;