diff options
| author | Noel Grandin <noel@peralex.com> | 2014-01-30 13:46:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-04 22:50:39 +0000 |
| commit | 186b4ebc99a2e80740fee51f9d0276886a003617 (patch) | |
| tree | a86a4ff5fe3cd36add7053212ef37531540be253 /sot/source/sdstor/stgelem.cxx | |
| parent | 95a7e952552adb834f92d1477f83938e7c8d0204 (diff) | |
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>
Diffstat (limited to 'sot/source/sdstor/stgelem.cxx')
| -rw-r--r-- | sot/source/sdstor/stgelem.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
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 |