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

8 files changed, 13 insertions, 13 deletions

diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 1bce440ec8b8..9ed8d618989b 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -227,7 +227,7 @@ SvStream& Color::Write( SvStream& rOStm, bool bNewFormat )
     if ( bNewFormat )
         rOStm.WriteUInt32( mnColor );
     else
-        rOStm << *this;
+        WriteColor( rOStm, *this );
 
     return rOStm;
 }
@@ -300,7 +300,7 @@ SvStream& operator>>( SvStream& rIStream, Color& rColor )
     return rIStream;
 }
 
-SvStream& operator<<( SvStream& rOStream, const Color& rColor )
+SvStream& WriteColor( SvStream& rOStream, const Color& rColor )
 {
     DBG_ASSERTWARNING( rOStream.GetVersion(), "Color::<< - Solar-Version not set on rOStream" );
 
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 3610065222bd..a8a550675ac6 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -493,7 +493,7 @@ SvStream& operator >> ( SvStream& rIStream, Fraction& rFract )
     return rIStream;
 }
 
-SvStream& operator << ( SvStream& rOStream, const Fraction& rFract )
+SvStream& WriteFraction( SvStream& rOStream, const Fraction& rFract )
 {
     //fdo#39428 SvStream no longer supports operator<<(long)
     rOStream.WriteInt32( sal::static_int_cast<sal_Int32>(rFract.nNumerator) );
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index a0c74b5c3713..9643a8115219 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@@ -34,7 +34,7 @@ SvStream& operator>>( SvStream& rIStream, Pair& rPair )
     return rIStream;
 }
 
-SvStream& operator<<( SvStream& rOStream, const Pair& rPair )
+SvStream& WritePair( SvStream& rOStream, const Pair& rPair )
 {
     DBG_ASSERTWARNING( rOStream.GetVersion(), "Pair::<< - Solar-Version not set on rOStream" );
 
@@ -186,7 +186,7 @@ SvStream& operator>>( SvStream& rIStream, Rectangle& rRect )
     return rIStream;
 }
 
-SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect )
+SvStream& WriteRectangle( SvStream& rOStream, const Rectangle& rRect )
 {
     DBG_ASSERTWARNING( rOStream.GetVersion(), "Rectangle::<< - Solar-Version not set on rOStream" );
 
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 93f4bb685ba5..2e559940ea4f 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -1595,7 +1595,7 @@ SvStream& operator>>( SvStream& rIStream, Polygon& rPoly )
     return rIStream;
 }
 
-SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly )
+SvStream& WritePolygon( SvStream& rOStream, const Polygon& rPoly )
 {
     DBG_CHKOBJ( &rPoly, Polygon, NULL );
     DBG_ASSERTWARNING( rOStream.GetVersion(), "Polygon::<< - Solar-Version not set on rOStream" );
@@ -1659,7 +1659,7 @@ void Polygon::Read( SvStream& rIStream )
 void Polygon::ImplWrite( SvStream& rOStream ) const
 {
     bool bHasPolyFlags = mpImplPolygon->mpFlagAry != NULL;
-    rOStream << *this;
+    WritePolygon( rOStream, *this );
     rOStream.WriteUChar(sal_uInt8(bHasPolyFlags));
 
     if ( bHasPolyFlags )
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 7b92501a6cb5..28a7df509f3d 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -623,7 +623,7 @@ SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly )
     return rIStream;
 }
 
-SvStream& operator<<( SvStream& rOStream, const PolyPolygon& rPolyPoly )
+SvStream& WritePolyPolygon( SvStream& rOStream, const PolyPolygon& rPolyPoly )
 {
     DBG_CHKOBJ( &rPolyPoly, PolyPolygon, NULL );
     DBG_ASSERTWARNING( rOStream.GetVersion(), "PolyPolygon::<< - Solar-Version not set on rOStream" );
@@ -634,7 +634,7 @@ SvStream& operator<<( SvStream& rOStream, const PolyPolygon& rPolyPoly )
 
     // output polygons
     for ( sal_uInt16 i = 0; i < nPolyCount; i++ )
-        rOStream << *(rPolyPoly.mpImplPolyPolygon->mpPolyAry[i]);
+        WritePolygon( rOStream, *(rPolyPoly.mpImplPolyPolygon->mpPolyAry[i]) );
 
     return rOStream;
 }
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 3cd6300ddfbf..bdc7489c52c8 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -109,7 +109,7 @@ SvStream& INetMessage::operator<< (SvStream& rStrm) const
     rStrm.WriteUInt32( static_cast<sal_uInt32>(n) );
 
     for (i = 0; i < n; i++)
-        rStrm << *( m_aHeaderList[ i ] );
+        WriteINetMessageHeader( rStrm, *( m_aHeaderList[ i ] ) );
 
     return rStrm;
 }
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index 7eb2022d1599..f23b1ea6ca7d 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -120,7 +120,7 @@ void SvGlobalName::NewImp()
     }
 }
 
-SvStream& operator << ( SvStream& rOStr, const SvGlobalName & rObj )
+SvStream& WriteSvGlobalName( SvStream& rOStr, const SvGlobalName & rObj )
 {
     sal_uInt32 a;
     memcpy(&a, rObj.pImp->szData, sizeof(sal_uInt32));
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index e84f9fd47f86..c84a0b03c783 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -642,7 +642,7 @@ SvPersistStream& SvPersistStream::ReadPointer
     return *this;
 }
 
-SvPersistStream& operator <<
+SvPersistStream& WriteSvPersistBase
 (
     SvPersistStream & rStm,
     SvPersistBase * pObj
@@ -660,7 +660,7 @@ SvPersistStream& operator >>
     return rStm.ReadPointer( rpObj );
 }
 
-SvStream& operator <<
+SvStream& WriteSvPersistStream
 (
     SvStream & rStm,
     SvPersistStream & rThis