remove LwpSvStream::operator>> methods

in favour of ReadXXX methods.

Change-Id: Ifa627cf190b22315f4ce294c1ec268c4d1361748

5 files changed, 41 insertions, 41 deletions

diff --git a/lotuswordpro/source/filter/lwpfilehdr.cxx b/lotuswordpro/source/filter/lwpfilehdr.cxx
index d2d87ac6064c..5bcbf6d981a4 100644
--- a/lotuswordpro/source/filter/lwpfilehdr.cxx
+++ b/lotuswordpro/source/filter/lwpfilehdr.cxx
@@ -70,22 +70,22 @@ LwpFileHeader::LwpFileHeader()
 sal_uInt32 LwpFileHeader::Read(LwpSvStream *pStrm)
 {
     sal_uInt32 len = 0;
-    *pStrm >> m_nAppRevision;
+    pStrm->ReadUInt16( m_nAppRevision );
     len += sizeof(m_nAppRevision);
-    *pStrm >> m_nFileRevision;
+    pStrm->ReadUInt16( m_nFileRevision );
     len += sizeof(m_nFileRevision);
-    *pStrm >> m_nAppReleaseNo;
+    pStrm->ReadUInt16( m_nAppReleaseNo );
     len += sizeof(m_nAppReleaseNo);
-    *pStrm >> m_nRequiredAppRevision;
+    pStrm->ReadUInt16( m_nRequiredAppRevision );
     len += sizeof(m_nRequiredAppRevision);
-    *pStrm >> m_nRequiredFileRevision;
+    pStrm->ReadUInt16( m_nRequiredFileRevision );
     len += sizeof(m_nRequiredFileRevision);
     len += m_cDocumentID.Read(pStrm);
     if (m_nFileRevision < 0x000B)
         m_nRootIndexOffset = BAD_OFFSET;
     else
     {
-        *pStrm >> m_nRootIndexOffset;
+        pStrm->ReadUInt32( m_nRootIndexOffset );
         len += sizeof(m_nRootIndexOffset);
     }
     return len;
diff --git a/lotuswordpro/source/filter/lwpobjhdr.cxx b/lotuswordpro/source/filter/lwpobjhdr.cxx
index d15aa5234d76..2010b78e0aa5 100644
--- a/lotuswordpro/source/filter/lwpobjhdr.cxx
+++ b/lotuswordpro/source/filter/lwpobjhdr.cxx
@@ -85,11 +85,11 @@ bool LwpObjectHeader::Read(LwpSvStream &rStrm)
 
     if ( LwpFileHeader::m_nFileRevision < 0x000B)
     {
-        rStrm >> m_nTag;
+        rStrm.ReadUInt32( m_nTag );
         m_ID.Read(&rStrm);
-        rStrm >> nVersionID;
-        rStrm >> nRefCount;
-        rStrm >> nNextVersionOffset;
+        rStrm.ReadUInt32( nVersionID );
+        rStrm.ReadUInt32( nRefCount );
+        rStrm.ReadUInt32( nNextVersionOffset );
 
         nHeaderSize = sizeof(m_nTag) + m_ID.DiskSize()
             + sizeof(nVersionID)
@@ -100,17 +100,17 @@ bool LwpObjectHeader::Read(LwpSvStream &rStrm)
         if ((m_nTag == TAG_AMI) || ( LwpFileHeader::m_nFileRevision < 0x0006))
         {
             sal_uInt32 nNextVersionID = 0;
-            rStrm >> nNextVersionID;
+            rStrm.ReadUInt32( nNextVersionID );
             nHeaderSize += sizeof(nNextVersionID);
         }
-        rStrm >> m_nSize;
+        rStrm.ReadUInt32( m_nSize );
     }
     else
     {
         sal_uInt8 nFlagBits = 0;
         sal_uInt16 VOType = 0;
-        rStrm >> VOType;
-        rStrm >> nFlagBits;
+        rStrm.ReadUInt16( VOType );
+        rStrm.ReadUInt8( nFlagBits );
 
         m_nTag = static_cast<sal_uInt32>(VOType);
         m_ID.ReadIndexed(&rStrm);
@@ -121,19 +121,19 @@ bool LwpObjectHeader::Read(LwpSvStream &rStrm)
         switch (nFlagBits & VERSION_BITS)
         {
             case ONE_BYTE_VERSION:
-                rStrm >> tmpByte;
+                rStrm.ReadUInt8( tmpByte );
                 nVersionID = static_cast<sal_uInt32>( tmpByte );
                 nHeaderSize++;
                 break;
 
             case TWO_BYTE_VERSION:
-                rStrm >> tmpShort;
+                rStrm.ReadUInt16( tmpShort );
                 nVersionID = static_cast<sal_uInt32>( tmpShort );
                 nHeaderSize += 2;
                 break;
 
             case FOUR_BYTE_VERSION:
-                rStrm >> nVersionID;
+                rStrm.ReadUInt32( nVersionID );
                 nHeaderSize += 4;
                 break;
             case DEFAULT_VERSION:   //fall through
@@ -145,27 +145,27 @@ bool LwpObjectHeader::Read(LwpSvStream &rStrm)
         switch (nFlagBits & REFCOUNT_BITS)
         {
             case ONE_BYTE_REFCOUNT:
-                rStrm >> tmpByte;
+                rStrm.ReadUInt8( tmpByte );
                 nRefCount = static_cast<sal_uInt32>( tmpByte );
                 nHeaderSize++;
                 break;
 
             case TWO_BYTE_REFCOUNT:
-                rStrm >> tmpShort;
+                rStrm.ReadUInt16( tmpShort );
                 nRefCount = static_cast<sal_uInt32>( tmpShort );
                 nHeaderSize += 2;
                 break;
 
             case FOUR_BYTE_REFCOUNT:    //through
             default:
-                rStrm >> nRefCount;
+                rStrm.ReadUInt32( nRefCount );
                 nHeaderSize += 4;
                 break;
         }
 
         if (nFlagBits & HAS_PREVOFFSET)
         {
-            rStrm >> nNextVersionOffset;
+            rStrm.ReadUInt32( nNextVersionOffset );
             nHeaderSize += 4;
         }
         else
@@ -174,20 +174,20 @@ bool LwpObjectHeader::Read(LwpSvStream &rStrm)
         switch (nFlagBits & SIZE_BITS)
         {
             case ONE_BYTE_SIZE:
-                rStrm >> tmpByte;
+                rStrm.ReadUInt8( tmpByte );
                 m_nSize = static_cast<sal_uInt32>( tmpByte );
                 nHeaderSize++;
                 break;
 
             case TWO_BYTE_SIZE:
-                rStrm >> tmpShort;
+                rStrm.ReadUInt16( tmpShort );
                 m_nSize = static_cast<sal_uInt32>(tmpShort);
                 nHeaderSize += 2;
                 break;
 
             case FOUR_BYTE_SIZE:    //go through
             default:
-                rStrm >> m_nSize;
+                rStrm.ReadUInt32( m_nSize );
                 nHeaderSize += 4;
                 break;
         }
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index 0c64f91a70a9..54b4778e2175 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -77,8 +77,8 @@ LwpObjectID::LwpObjectID(sal_uInt32 low, sal_uInt16 high)
 */
 sal_uInt32 LwpObjectID::Read(LwpSvStream *pStrm)
 {
-    *pStrm >> m_nLow;
-    *pStrm >> m_nHigh;
+    pStrm->ReadUInt32( m_nLow );
+    pStrm->ReadUInt16( m_nHigh );
     return DiskSize();
 }
 /**
@@ -104,7 +104,7 @@ sal_uInt32 LwpObjectID::ReadIndexed(LwpSvStream *pStrm)
         return Read(pStrm);
     }
 
-    *pStrm >> m_nIndex;
+    pStrm->ReadUInt8( m_nIndex );
 
     if (m_nIndex)
     {
@@ -117,9 +117,9 @@ sal_uInt32 LwpObjectID::ReadIndexed(LwpSvStream *pStrm)
     }
     else
     {
-        *pStrm >> m_nLow;
+        pStrm->ReadUInt32( m_nLow );
     }
-    *pStrm >> m_nHigh;
+    pStrm->ReadUInt16( m_nHigh );
     return DiskSizeIndexed();
 }
 
diff --git a/lotuswordpro/source/filter/lwpsvstream.cxx b/lotuswordpro/source/filter/lwpsvstream.cxx
index 3cd2c44703a4..b65696fbee1b 100644
--- a/lotuswordpro/source/filter/lwpsvstream.cxx
+++ b/lotuswordpro/source/filter/lwpsvstream.cxx
@@ -70,37 +70,37 @@ sal_Int32 LwpSvStream::Read(void* buf, sal_Int32 nBytesToRead)
     return m_pStream->Read(buf,nBytesToRead);
 }
 
-LwpSvStream& LwpSvStream::operator>>( sal_uInt8& rUInt8 )
+LwpSvStream& LwpSvStream::ReadUInt8( sal_uInt8& rUInt8 )
 {
     m_pStream->ReadUChar( rUInt8 );
     return *this;
 }
 
-LwpSvStream& LwpSvStream::operator>>( sal_uInt16& rUInt16 )
+LwpSvStream& LwpSvStream::ReadUInt16( sal_uInt16& rUInt16 )
 {
     m_pStream->ReadUInt16( rUInt16 );
     return *this;
 }
 
-LwpSvStream& LwpSvStream::operator>>( sal_uInt32& rUInt32 )
+LwpSvStream& LwpSvStream::ReadUInt32( sal_uInt32& rUInt32 )
 {
     m_pStream->ReadUInt32( rUInt32 );
     return *this;
 }
 
-LwpSvStream& LwpSvStream::operator>>( sal_Int8& rInt8 )
+LwpSvStream& LwpSvStream::ReadInt8( sal_Int8& rInt8 )
 {
     m_pStream->ReadSChar( rInt8 );
     return *this;
 }
 
-LwpSvStream& LwpSvStream::operator>>( sal_Int16& rInt16 )
+LwpSvStream& LwpSvStream::ReadInt16( sal_Int16& rInt16 )
 {
     m_pStream->ReadInt16( rInt16 );
     return *this;
 }
 
-LwpSvStream& LwpSvStream::operator>>( sal_Int32& rInt32 )
+LwpSvStream& LwpSvStream::ReadInt32( sal_Int32& rInt32 )
 {
     m_pStream->ReadInt32( rInt32 );
     return *this;
diff --git a/lotuswordpro/source/filter/lwpsvstream.hxx b/lotuswordpro/source/filter/lwpsvstream.hxx
index b8a4aa62438c..0917cd461c7e 100644
--- a/lotuswordpro/source/filter/lwpsvstream.hxx
+++ b/lotuswordpro/source/filter/lwpsvstream.hxx
@@ -72,13 +72,13 @@ public:
     sal_Int64 Tell();
     sal_Int64 Seek( sal_Int64 pos );
 
-    LwpSvStream& operator>>( sal_uInt8& rUInt8 );
-    LwpSvStream& operator>>( sal_uInt16& rUInt16 );
-    LwpSvStream& operator>>( sal_uInt32& rUInt32 );
+    LwpSvStream& ReadUInt8( sal_uInt8& rUInt8 );
+    LwpSvStream& ReadUInt16( sal_uInt16& rUInt16 );
+    LwpSvStream& ReadUInt32( sal_uInt32& rUInt32 );
 
-    LwpSvStream& operator>>( sal_Int8& rInt8 );
-    LwpSvStream& operator>>( sal_Int16& rInt16 );
-    LwpSvStream& operator>>( sal_Int32& rInt32 );
+    LwpSvStream& ReadInt8( sal_Int8& rInt8 );
+    LwpSvStream& ReadInt16( sal_Int16& rInt16 );
+    LwpSvStream& ReadInt32( sal_Int32& rInt32 );
 
     static const sal_uInt32 LWP_STREAM_BASE;