summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-01-14 13:52:54 +0200
committerMichael Stahl <mstahl@redhat.com>2014-01-16 16:08:34 +0100
commitc648d0872058941ed18499a8bf1993037d9b5532 (patch)
tree47121b3eff267e34480335130106ca1c33be6fd9 /sot
parent70f360f34a9f6605864644feee3c9b9b6ffb79a1 (diff)
convert SvStream::operator<< overloads to more explicit methods
This is in preparation for more conversion of SvStream::operator<< calls to use more explicit method names. This converts the subclasses that have their own convenience overloads of operator<< to use normal methods. Change-Id: I5efd5d9a24c264cb86d2471303dd5849bf91ba80
Diffstat (limited to 'sot')
-rw-r--r--sot/source/base/filelist.cxx4
-rw-r--r--sot/source/sdstor/stgelem.cxx6
-rw-r--r--sot/source/sdstor/stgelem.hxx2
-rw-r--r--sot/source/sdstor/stgole.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index 4493fcf129ed..ab0c4920cacb 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -68,7 +68,7 @@ void FileList::Load( SvStream& rIStm )
void FileList::Save( SvStream& rOStm )
{
- rOStm << *this;
+ WriteFileList( rOStm, *this );
}
void FileList::Assign( const SvDataCopyStream& rCopyStream )
@@ -87,7 +87,7 @@ void FileList::Assign( const SvDataCopyStream& rCopyStream )
* e.g. DropQueryFile
*/
-SvStream& operator<<( SvStream& rOStm, SAL_UNUSED_PARAMETER const FileList& )
+SvStream& WriteFileList( SvStream& rOStm, SAL_UNUSED_PARAMETER const FileList& )
{
OSL_FAIL("TODO: Not implemented!");
return rOStm;
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 46083e0ee462..0b10719312e9 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -51,7 +51,7 @@ SvStream& operator >>( SvStream& r, ClsId& rId )
return r;
}
-SvStream& operator <<( SvStream& r, const ClsId& rId )
+SvStream& WriteClsId( SvStream& r, const ClsId& rId )
{
return
r .WriteInt32( (sal_Int32) rId.n1 )
@@ -159,7 +159,7 @@ bool StgHeader::Store( StgIo& rIo )
SvStream& r = *rIo.GetStrm();
r.Seek( 0L );
r.Write( cSignature, 8 );
- r << aClsId; // 08 Class ID
+ WriteClsId( r, aClsId ); // 08 Class ID
r.WriteInt32( nVersion ) // 1A version number
.WriteUInt16( nByteOrder ) // 1C Unicode byte order indicator
.WriteInt16( nPageSize ) // 1E 1 << nPageSize = block size
@@ -427,7 +427,7 @@ void StgEntry::Store( void* pTo )
.WriteInt32( nLeft ) // 44 left node entry
.WriteInt32( nRight ) // 48 right node entry
.WriteInt32( nChild ); // 4C 1st child entry if storage;
- r << aClsId; // 50 class ID (optional)
+ WriteClsId( r, aClsId ); // 50 class ID (optional)
r.WriteInt32( nFlags ) // 60 state flags(?)
.WriteInt32( nMtime[ 0 ] ) // 64 modification time
.WriteInt32( nMtime[ 1 ] ) // 64 modification time
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 7cdd546b8f85..822d4e837e1c 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -31,7 +31,7 @@ class StgIo;
class SvStream;
SvStream& operator>>( SvStream&, ClsId& );
-SvStream& operator<<( SvStream&, const ClsId& );
+SvStream& WriteClsId( SvStream&, const ClsId& );
class StgHeader
{
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 1e83d36deec8..0f87b5411983 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -148,7 +148,7 @@ bool StgCompObjStream::Store()
WriteInt16( (sal_Int16) -2 ); // 0xFFFE = Byte Order Indicator
WriteInt32( (sal_Int32) 0x0A03 ); // Windows 3.10
WriteInt32( (sal_Int32) -1L );
- *this << aClsId; // Class ID
+ WriteClsId( *this, aClsId ); // Class ID
WriteInt32( (sal_Int32) (aAsciiUserName.getLength() + 1) );
WriteCharPtr( (const char *)aAsciiUserName.getStr() );
WriteUChar( (sal_uInt8) 0 ); // string terminator