diff options
| author | Noel Grandin <noel@peralex.com> | 2014-12-11 08:20:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-12-11 14:57:34 +0200 |
| commit | 5d75ef73a2e77e93da1ac3cf77c7dbb170107935 (patch) | |
| tree | 99072890c13d26ea2041d7600734d0fcdd75f6fe /lotuswordpro/source/filter/lwpobjhdr.cxx | |
| parent | update documentation (diff) | |
| download | core-5d75ef73a2e77e93da1ac3cf77c7dbb170107935.tar.gz core-5d75ef73a2e77e93da1ac3cf77c7dbb170107935.zip | |
remove LwpSvStream::operator>> methods
in favour of ReadXXX methods.
Change-Id: Ifa627cf190b22315f4ce294c1ec268c4d1361748
Diffstat (limited to 'lotuswordpro/source/filter/lwpobjhdr.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwpobjhdr.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
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; } |