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>

12 files changed, 69 insertions, 69 deletions

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 7a22f786c771..620deb98e740 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -545,16 +545,16 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
     sal_uInt16 nId;
     sal_uInt16 nVer;
 
-    rSStream >> nEndPos;
-    rSStream >> nId;
-    rSStream >> nVer;
+    rSStream.ReadUInt32( nEndPos );
+    rSStream.ReadUInt16( nId );
+    rSStream.ReadUInt16( nVer );
 
     DBG_ASSERT( nId == LIBINFO_ID, "No BasicLibInfo?!" );
     if( nId == LIBINFO_ID )
     {
         // Reload?
         sal_Bool bDoLoad;
-        rSStream >> bDoLoad;
+        rSStream.ReadUChar( bDoLoad );
         pInfo->bDoLoad = bDoLoad;
 
         // The name of the lib...
@@ -572,7 +572,7 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
         if ( nVer >= 2 )
         {
             sal_Bool bReferenz;
-            rSStream >> bReferenz;
+            rSStream.ReadUChar( bReferenz );
             pInfo->IsReference() = bReferenz;
         }
 
@@ -637,7 +637,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, Star
         // in an 6.0+ office. So also the old basic dialogs can be saved.
         SotStorageStreamRef xManagerStream = rStorage.OpenSotStream( OUString(szManagerStream), eStreamReadMode );
         mpImpl->mpManagerStream = new SvMemoryStream();
-        *static_cast<SvStream*>(&xManagerStream) >> *mpImpl->mpManagerStream;
+        static_cast<SvStream*>(&xManagerStream)->ReadStream( *mpImpl->mpManagerStream );
 
         SotStorageRef xBasicStorage = rStorage.OpenSotStorage( OUString(szBasicStorage), eStorageReadMode, sal_False );
         if( xBasicStorage.Is() && !xBasicStorage->GetError() )
@@ -650,7 +650,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, Star
                 DBG_ASSERT( pInfo, "pInfo?!" );
                 SotStorageStreamRef xBasicStream = xBasicStorage->OpenSotStream( pInfo->GetLibName(), eStreamReadMode );
                 mpImpl->mppLibStreams[nL] = new SvMemoryStream();
-                *static_cast<SvStream*>(&xBasicStream) >> *( mpImpl->mppLibStreams[nL] );
+                static_cast<SvStream*>(&xBasicStream)->ReadStream( *( mpImpl->mppLibStreams[nL] ) );
             }
         }
     }
@@ -858,10 +858,10 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase
     xManagerStream->Seek( STREAM_SEEK_TO_BEGIN );
 
     sal_uInt32 nEndPos;
-    *xManagerStream >> nEndPos;
+    xManagerStream->ReadUInt32( nEndPos );
 
     sal_uInt16 nLibs;
-    *xManagerStream >> nLibs;
+    xManagerStream->ReadUInt16( nLibs );
     // Plausibility!
     if( nLibs & 0xF000 )
     {
@@ -930,8 +930,8 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
     xManagerStream->SetBufferSize( 1024 );
     xManagerStream->Seek( STREAM_SEEK_TO_BEGIN );
     sal_uInt32 nBasicStartOff, nBasicEndOff;
-    *xManagerStream >> nBasicStartOff;
-    *xManagerStream >> nBasicEndOff;
+    xManagerStream->ReadUInt32( nBasicStartOff );
+    xManagerStream->ReadUInt32( nBasicEndOff );
 
     DBG_ASSERT( !xManagerStream->GetError(), "Invalid Manager-Stream!" );
 
@@ -1139,7 +1139,7 @@ sal_Bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurS
                 xBasicStream->SetCryptMaskKey(szCryptingKey);
                 xBasicStream->RefreshBuffer();
                 sal_uInt32 nPasswordMarker = 0;
-                *xBasicStream >> nPasswordMarker;
+                xBasicStream->ReadUInt32( nPasswordMarker );
                 if ( ( nPasswordMarker == PASSWORD_MARKER ) && !xBasicStream->IsEof() )
                 {
                     OUString aPassword = xBasicStream->ReadUniOrByteString(
@@ -1159,7 +1159,7 @@ sal_Bool BasicManager::ImplEncryptStream( SvStream& rStrm ) const
 {
     sal_uIntPtr nPos = rStrm.Tell();
     sal_uInt32 nCreator;
-    rStrm >> nCreator;
+    rStrm.ReadUInt32( nCreator );
     rStrm.Seek( nPos );
     sal_Bool bProtected = sal_False;
     if ( nCreator != SBXCR_SBX )
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 2cf81ae6e3b3..cea14ddcd0fd 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -111,7 +111,7 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
 
     Clear();
     // Read Master-Record
-    r >> nSign >> nLen >> nCount;
+    r.ReadUInt16( nSign ).ReadUInt32( nLen ).ReadUInt16( nCount );
     sal_uIntPtr nLast = r.Tell() + nLen;
     sal_uInt32 nCharSet;               // System charset
     sal_uInt32 lDimBase;
@@ -121,8 +121,8 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
     bool bBadVer = false;
     if( nSign == B_MODULE )
     {
-        r >> nVersion >> nCharSet >> lDimBase
-          >> nFlags >> nReserved1 >> nReserved2 >> nReserved3;
+        r.ReadUInt32( nVersion ).ReadUInt32( nCharSet ).ReadUInt32( lDimBase )
+         .ReadUInt16( nFlags ).ReadUInt16( nReserved1 ).ReadUInt32( nReserved2 ).ReadUInt32( nReserved3 );
         eCharSet = nCharSet;
         eCharSet = GetSOLoadTextEncoding( eCharSet );
         bBadVer  = ( nVersion > B_CURVERSION );
@@ -135,7 +135,7 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
     while( ( nNext = r.Tell() ) < nLast )
     {
 
-        r >> nSign >> nLen >> nCount;
+        r.ReadUInt16( nSign ).ReadUInt32( nLen ).ReadUInt16( nCount );
         nNext += nLen + 8;
         if( r.GetError() == SVSTREAM_OK )
         {
@@ -196,10 +196,10 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
                 short i;
                 for( i = 0; i < nStrings && SbiGood( r ); i++ )
                 {
-                    r >> nOff;
+                    r.ReadUInt32( nOff );
                     pStringOff[ i ] = (sal_uInt16) nOff;
                 }
-                r >> nLen;
+                r.ReadUInt32( nLen );
                 if( SbiGood( r ) )
                 {
                     delete [] pStrings;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 869db65846bb..bb9569b2e2bf 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1889,7 +1889,7 @@ sal_Bool StarBASIC::LoadData( SvStream& r, sal_uInt16 nVer )
 
     sal_uInt16 nMod;
     pModules->Clear();
-    r >> nMod;
+    r.ReadUInt16( nMod );
     for( sal_uInt16 i = 0; i < nMod; i++ )
     {
         SbxBase* pBase = SbxBase::Load( r );
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index a75922bdc262..0e90a256d4f5 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1668,7 +1668,7 @@ sal_Bool SbModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
     // As a precaution...
     SetFlag( SBX_EXTSEARCH | SBX_GBLSEARCH );
     sal_uInt8 bImage;
-    rStrm >> bImage;
+    rStrm.ReadUChar( bImage );
     if( bImage )
     {
         SbiImage* p = new SbiImage;
@@ -2076,10 +2076,10 @@ sal_Bool SbMethod::LoadData( SvStream& rStrm, sal_uInt16 nVer )
     if( !SbxMethod::LoadData( rStrm, 1 ) )
         return sal_False;
     sal_Int16 n;
-    rStrm >> n;
+    rStrm.ReadInt16( n );
     sal_Int16 nTempStart = (sal_Int16)nStart;
     if( nVer == 2 )
-        rStrm >> nLine1 >> nLine2 >> nTempStart >> bInvalid;
+        rStrm.ReadUInt16( nLine1 ).ReadUInt16( nLine2 ).ReadInt16( nTempStart ).ReadUChar( bInvalid );
     // HACK ue to 'Referenz could not be saved'
     SetFlag( SBX_NO_MODIFY );
     nStart = nTempStart;
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;
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index a25e46e24f3b..ab65a28b1a38 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -530,12 +530,12 @@ sal_Bool SbxArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
     sal_Bool bRes = sal_True;
     sal_uInt16 f = nFlags;
     nFlags |= SBX_WRITE;
-    rStrm >> nElem;
+    rStrm.ReadUInt16( nElem );
     nElem &= 0x7FFF;
     for( sal_uInt32 n = 0; n < nElem; n++ )
     {
         sal_uInt16 nIdx;
-        rStrm >> nIdx;
+        rStrm.ReadUInt16( nIdx );
         SbxVariable* pVar = (SbxVariable*) Load( rStrm );
         if( pVar )
         {
@@ -818,11 +818,11 @@ SbxVariable* SbxDimArray::Get( SbxArray* pPar )
 sal_Bool SbxDimArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     short nDimension;
-    rStrm >> nDimension;
+    rStrm.ReadInt16( nDimension );
     for( short i = 0; i < nDimension && rStrm.GetError() == SVSTREAM_OK; i++ )
     {
         sal_Int16 lb, ub;
-        rStrm >> lb >> ub;
+        rStrm.ReadInt16( lb ).ReadInt16( ub );
         AddDim( lb, ub );
     }
     return SbxArray::LoadData( rStrm, nVer );
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 376da5467ae3..bf73df07ec35 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -216,14 +216,14 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
 {
     sal_uInt16 nSbxId, nFlags, nVer;
     sal_uInt32 nCreator, nSize;
-    rStrm >> nCreator >> nSbxId >> nFlags >> nVer;
+    rStrm.ReadUInt32( nCreator ).ReadUInt16( nSbxId ).ReadUInt16( nFlags ).ReadUInt16( nVer );
 
     // Correcting a foolishness of mine:
     if( nFlags & SBX_RESERVED )
         nFlags = ( nFlags & ~SBX_RESERVED ) | SBX_GBLSEARCH;
 
     sal_uIntPtr nOldPos = rStrm.Tell();
-    rStrm >> nSize;
+    rStrm.ReadUInt32( nSize );
     SbxBase* p = Create( nSbxId, nCreator );
     if( p )
     {
@@ -260,10 +260,10 @@ void SbxBase::Skip( SvStream& rStrm )
 {
     sal_uInt16 nSbxId, nFlags, nVer;
     sal_uInt32 nCreator, nSize;
-    rStrm >> nCreator >> nSbxId >> nFlags >> nVer;
+    rStrm.ReadUInt32( nCreator ).ReadUInt16( nSbxId ).ReadUInt16( nFlags ).ReadUInt16( nVer );
 
     sal_uIntPtr nStartPos = rStrm.Tell();
-    rStrm >> nSize;
+    rStrm.ReadUInt32( nSize );
 
     rStrm.Seek( nStartPos + nSize );
 }
@@ -372,16 +372,16 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer )
         RTL_TEXTENCODING_ASCII_US);
     aHelpFile = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
         RTL_TEXTENCODING_ASCII_US);
-    rStrm >> nHelpId >> nParam;
+    rStrm.ReadUInt32( nHelpId ).ReadUInt16( nParam );
     while( nParam-- )
     {
         sal_uInt16 nType, nFlags;
         sal_uInt32 nUserData = 0;
         OUString aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
             RTL_TEXTENCODING_ASCII_US);
-        rStrm >> nType >> nFlags;
+        rStrm.ReadUInt16( nType ).ReadUInt16( nFlags );
         if( nVer > 1 )
-            rStrm >> nUserData;
+            rStrm.ReadUInt32( nUserData );
         AddParam( aName, (SbxDataType) nType, nFlags );
         SbxParamInfo& p(aParams.back());
         p.nUserData = nUserData;
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 741735b32186..7c40c7868b4f 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -304,7 +304,7 @@ sal_Bool SbxStdCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer )
     {
         aElemClass = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
             RTL_TEXTENCODING_ASCII_US);
-        rStrm >> bAddRemoveOk;
+        rStrm.ReadUChar( bAddRemoveOk );
     }
     return bRes;
 }
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 4b6c7dbcff5e..7095294d5abb 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -638,7 +638,7 @@ sal_Bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer )
     aClassName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm, RTL_TEXTENCODING_ASCII_US);
     aDfltProp = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm, RTL_TEXTENCODING_ASCII_US);
     sal_uIntPtr nPos = rStrm.Tell();
-    rStrm >> nSize;
+    rStrm.ReadUInt32( nSize );
     if( !LoadPrivateData( rStrm, nVer ) )
     {
         return sal_False;
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 3cdaeb588e20..25c3d652b7eb 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1408,15 +1408,15 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
     // more than likely this is functionality used in the binfilter alone
     SbxValue::Clear();
     sal_uInt16 nType;
-    r >> nType;
+    r.ReadUInt16( nType );
     aData.eType = SbxDataType( nType );
     switch( nType )
     {
         case SbxBOOL:
         case SbxINTEGER:
-            r >> aData.nInteger; break;
+            r.ReadInt16( aData.nInteger ); break;
         case SbxLONG:
-            r >> aData.nLong; break;
+            r.ReadInt32( aData.nLong ); break;
         case SbxSINGLE:
         {
             // Floats as ASCII
@@ -1451,13 +1451,13 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
             r.ReadInt64(aData.nInt64);
             break;
         case SbxSALUINT64:
-            r >> aData.uInt64;
+            r.ReadUInt64( aData.uInt64 );
             break;
         case SbxCURRENCY:
         {
             sal_uInt32 tmpHi = 0;
             sal_uInt32 tmpLo = 0;
-            r >> tmpHi >> tmpLo;
+            r.ReadUInt32( tmpHi ).ReadUInt32( tmpLo );
             aData.nInt64 = ((sal_Int64)tmpHi << 32);
             aData.nInt64 |= (sal_Int64)tmpLo;
             break;
@@ -1474,11 +1474,11 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
             }
             case SbxERROR:
             case SbxUSHORT:
-                r >> aData.nUShort; break;
+                r.ReadUInt16( aData.nUShort ); break;
             case SbxOBJECT:
             {
                 sal_uInt8 nMode;
-                r >> nMode;
+                r.ReadUChar( nMode );
                 switch( nMode )
                 {
                     case 0:
@@ -1496,24 +1496,24 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
             case SbxCHAR:
             {
                 char c;
-                r >> c;
+                r.ReadChar( c );
                 aData.nChar = c;
                 break;
             }
             case SbxBYTE:
-                r >> aData.nByte; break;
+                r.ReadUChar( aData.nByte ); break;
             case SbxULONG:
-                r >> aData.nULong; break;
+                r.ReadUInt32( aData.nULong ); break;
             case SbxINT:
             {
                 sal_uInt8 n;
-                r >> n;
+                r.ReadUChar( n );
                 // Match the Int on this system?
                 if( n > SAL_TYPES_SIZEOFINT )
-                    r >> aData.nLong, aData.eType = SbxLONG;
+                    r.ReadInt32( aData.nLong ), aData.eType = SbxLONG;
                 else {
                     sal_Int32 nInt;
-                    r >> nInt;
+                    r.ReadInt32( nInt );
                     aData.nInt = nInt;
                 }
                 break;
@@ -1521,13 +1521,13 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
             case SbxUINT:
             {
                 sal_uInt8 n;
-                r >> n;
+                r.ReadUChar( n );
                 // Match the UInt on this system?
                 if( n > SAL_TYPES_SIZEOFINT )
-                    r >> aData.nULong, aData.eType = SbxULONG;
+                    r.ReadUInt32( aData.nULong ), aData.eType = SbxULONG;
                 else {
                     sal_uInt32 nUInt;
-                    r >> nUInt;
+                    r.ReadUInt32( nUInt );
                     aData.nUInt = nUInt;
                 }
                 break;
@@ -1537,7 +1537,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
             case SbxVOID:
                 break;
             case SbxDATAOBJECT:
-                r >> aData.nLong;
+                r.ReadInt32( aData.nLong );
                 break;
             // #78919 For backwards compatibility
             case SbxWSTRING:
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index d621d662706f..bc60b86549f6 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -505,7 +505,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     sal_uInt16 nType;
     sal_uInt8 cMark;
-    rStrm >> cMark;
+    rStrm.ReadUChar( cMark );
     if( cMark == 0xFF )
     {
         if( !SbxValue::LoadData( rStrm, nVer ) )
@@ -515,17 +515,17 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
         maName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
                                                                 RTL_TEXTENCODING_ASCII_US);
         sal_uInt32 nTemp;
-        rStrm >> nTemp;
+        rStrm.ReadUInt32( nTemp );
         nUserData = nTemp;
     }
     else
     {
         rStrm.SeekRel( -1L );
-        rStrm >> nType;
+        rStrm.ReadUInt16( nType );
         maName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
                                                                 RTL_TEXTENCODING_ASCII_US);
         sal_uInt32 nTemp;
-        rStrm >> nTemp;
+        rStrm.ReadUInt32( nTemp );
         nUserData = nTemp;
         // correction: old methods have instead of SbxNULL now SbxEMPTY
         if( nType == SbxNULL && GetClass() == SbxCLASS_METHOD )
@@ -542,9 +542,9 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
         case SbxBOOL:
         case SbxERROR:
         case SbxINTEGER:
-            rStrm >> aTmp.nInteger; break;
+            rStrm.ReadInt16( aTmp.nInteger ); break;
         case SbxLONG:
-            rStrm >> aTmp.nLong; break;
+            rStrm.ReadInt32( aTmp.nLong ); break;
         case SbxSINGLE:
         {
             // Floats as ASCII
@@ -592,7 +592,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
             return sal_False;
         }
     }
-    rStrm >> cMark;
+    rStrm.ReadUChar( cMark );
     // cMark is also a version number!
     // 1: initial version
     // 2: with nUserData