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

2 files changed, 11 insertions, 10 deletions

diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index 8db2b3460f8b..89fb675c6977 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -71,11 +71,12 @@ public:
     bool            operator!=( const ScBigAddress& r ) const
                     { return !operator==( r ); }
 
-    friend inline SvStream& operator<< ( SvStream& rStream, const ScBigAddress& rAdr );
+    friend inline SvStream& WriteScBigAddress( SvStream& rStream, const ScBigAddress& rAdr );
     friend inline SvStream& operator>> ( SvStream& rStream, ScBigAddress& rAdr );
 };
 
 
+
 inline void ScBigAddress::PutInOrder( ScBigAddress& r )
 {
     sal_Int32 nTmp;
@@ -130,7 +131,7 @@ inline ScAddress ScBigAddress::MakeAddress() const
 }
 
 
-inline SvStream& operator<< ( SvStream& rStream, const ScBigAddress& rAdr )
+inline SvStream& WriteScBigAddress( SvStream& rStream, const ScBigAddress& rAdr )
 {
     rStream << rAdr.nCol << rAdr.nRow << rAdr.nTab;
     return rStream;
@@ -196,7 +197,7 @@ public:
     bool            operator!=( const ScBigRange& r ) const
                         { return !operator==( r ); }
 
-    friend inline SvStream& operator<< ( SvStream& rStream, const ScBigRange& rRange );
+    friend inline SvStream& WriteScBigRange ( SvStream& rStream, const ScBigRange& rRange );
     friend inline SvStream& operator>> ( SvStream& rStream, ScBigRange& rRange );
 };
 
@@ -229,10 +230,10 @@ inline sal_Bool ScBigRange::Intersects( const ScBigRange& r ) const
 }
 
 
-inline SvStream& operator<< ( SvStream& rStream, const ScBigRange& rRange )
+inline SvStream& WriteScBigRange ( SvStream& rStream, const ScBigRange& rRange )
 {
-    rStream << rRange.aStart;
-    rStream << rRange.aEnd;
+    WriteScBigAddress( rStream, rRange.aStart );
+    WriteScBigAddress( rStream, rRange.aEnd );
     return rStream;
 }
 
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 3e8f9152b338..d1dc79a8d421 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -104,7 +104,7 @@ namespace
     }
 
     /// Write an AutoFormatSwBlob to stream.
-    SvStream& operator<<(SvStream &stream, AutoFormatSwBlob &blob)
+    SvStream& WriteAutoFormatSwBlob(SvStream &stream, AutoFormatSwBlob &blob)
     {
         const sal_uInt64 endOfBlob = stream.Tell() + sizeof(sal_uInt64) + blob.size;
         stream.WriteUInt64( endOfBlob );
@@ -192,7 +192,7 @@ void ScAfVersions::Write(SvStream& rStream, sal_uInt16 fileVersion)
 
     rStream.WriteUInt16( SvxAdjustItem(SVX_ADJUST_LEFT, 0).GetVersion(fileVersion) );
     if (fileVersion >= SOFFICE_FILEFORMAT_50)
-        rStream << swVersions;
+        WriteAutoFormatSwBlob( rStream, swVersions );
 
     rStream.WriteUInt16( SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY).GetVersion(fileVersion) );
     rStream.WriteUInt16( SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, ATTR_VER_JUSTIFY).GetVersion(fileVersion) );
@@ -413,7 +413,7 @@ sal_Bool ScAutoFormatDataField::Save( SvStream& rStream, sal_uInt16 fileVersion
 
     aAdjust.Store       ( rStream, aAdjust.GetVersion( fileVersion ) );
     if (fileVersion >= SOFFICE_FILEFORMAT_50)
-        rStream << m_swFields;
+        WriteAutoFormatSwBlob( rStream, m_swFields );
 
     aHorJustify.Store   ( rStream, aHorJustify.GetVersion( fileVersion ) );
     aVerJustify.Store   ( rStream, aVerJustify.GetVersion( fileVersion ) );
@@ -805,7 +805,7 @@ bool ScAutoFormatData::Save(SvStream& rStream, sal_uInt16 fileVersion)
     rStream.WriteUChar( ( b = bIncludeWidthHeight ) );
 
     if (fileVersion >= SOFFICE_FILEFORMAT_50)
-        rStream << m_swFields;
+        WriteAutoFormatSwBlob( rStream, m_swFields );
 
     sal_Bool bRet = 0 == rStream.GetError();
     for (sal_uInt16 i = 0; bRet && (i < 16); i++)