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

7 files changed, 12 insertions, 12 deletions

diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 7b13321c9512..626f6255a990 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -161,7 +161,7 @@ public:
     SvStream&           Write( SvStream& rOStm, bool bNewFormat = true );
 
     TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Color& rColor );
-    TOOLS_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStream, const Color& rColor );
+    TOOLS_DLLPUBLIC friend SvStream&    WriteColor( SvStream& rOStream, const Color& rColor );
 
     // get ::basegfx::BColor from this color
     ::basegfx::BColor getBColor() const { return ::basegfx::BColor(GetRed() / 255.0, GetGreen() / 255.0, GetBlue() / 255.0); }
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index aca04ee4ebf2..2e1bb2005e4d 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -66,7 +66,7 @@ public:
     friend inline   bool operator>=( const Fraction& rVal1, const Fraction& rVal2 );
 
     TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Fraction& rFract );
-    TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Fraction& rFract );
+    TOOLS_DLLPUBLIC friend SvStream& WriteFraction( SvStream& rOStream, const Fraction& rFract );
 };
 
 inline Fraction::Fraction( const Fraction& rFrac )
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 39860582cfbe..e3a33ca4f8c1 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -46,7 +46,7 @@ public:
     bool                operator != ( const Pair& rPair ) const;
 
     TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Pair& rPair );
-    TOOLS_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStream, const Pair& rPair );
+    TOOLS_DLLPUBLIC friend SvStream&    WritePair( SvStream& rOStream, const Pair& rPair );
 
 protected:
     long                nA;
@@ -418,7 +418,7 @@ public:
     friend inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt );
 
     TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Rectangle& rRect );
-    TOOLS_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStream, const Rectangle& rRect );
+    TOOLS_DLLPUBLIC friend SvStream&    WriteRectangle( SvStream& rOStream, const Rectangle& rRect );
 
     // ONE
     long                getX() const { return nLeft; }
diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx
index 9e9064cb3209..8bd996f779ff 100644
--- a/include/tools/globname.hxx
+++ b/include/tools/globname.hxx
@@ -79,7 +79,7 @@ public:
             ~SvGlobalName();
 
     TOOLS_DLLPUBLIC friend SvStream & operator >> ( SvStream &, SvGlobalName & );
-    TOOLS_DLLPUBLIC friend SvStream & operator << ( SvStream &, const SvGlobalName & );
+    TOOLS_DLLPUBLIC friend SvStream & WriteSvGlobalName( SvStream &, const SvGlobalName & );
 
     bool          operator < ( const SvGlobalName & rObj ) const;
     SvGlobalName& operator += ( sal_uInt32 );
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index 324a73395a64..d8af698dcc9a 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -62,7 +62,7 @@ public:
     const OString& GetName() const { return m_aName; }
     const OString& GetValue() const { return m_aValue; }
 
-    friend SvStream& operator<< (
+    friend SvStream& WriteINetMessageHeader(
         SvStream& rStrm, const INetMessageHeader& rHdr)
     {
         write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStrm, rHdr.m_aName);
@@ -194,7 +194,7 @@ public:
     SvLockBytes* GetDocumentLB() const { return m_xDocLB; }
     void         SetDocumentLB (SvLockBytes *pDocLB) { m_xDocLB = pDocLB; }
 
-    friend SvStream& operator<< (
+    friend SvStream& WriteINetMessage(
         SvStream& rStrm, const INetMessage& rMsg)
     {
         return rMsg.operator<< (rStrm);
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 04b21d0cd9b4..c67714310cba 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -178,7 +178,7 @@ public:
     // streaming a Polygon does ignore PolyFlags, so use the Write Or Read
     // method to take care of PolyFlags
     TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Polygon& rPoly );
-    TOOLS_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStream, const Polygon& rPoly );
+    TOOLS_DLLPUBLIC friend SvStream&    WritePolygon( SvStream& rOStream, const Polygon& rPoly );
 
     void                Read( SvStream& rIStream );
     void                Write( SvStream& rOStream ) const;
@@ -263,7 +263,7 @@ public:
     bool                IsEqual( const PolyPolygon& rPolyPoly ) const;
 
     TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly );
-    TOOLS_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStream, const PolyPolygon& rPolyPoly );
+    TOOLS_DLLPUBLIC friend SvStream&    WritePolyPolygon( SvStream& rOStream, const PolyPolygon& rPolyPoly );
 
     void                Read( SvStream& rIStream );
     void                Write( SvStream& rOStream ) const;
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index a959436e4b58..660fb3145132 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -134,7 +134,7 @@ public:
 };
 
 template<typename T>
-SvPersistStream& operator << (SvPersistStream &rStm, const SvDeclPersistList<T> &rLst)
+SvPersistStream& WriteSvDeclPersistList(SvPersistStream &rStm, const SvDeclPersistList<T> &rLst)
 {
     WritePersistListObjects( rLst, rStm );
     return rStm;
@@ -232,12 +232,12 @@ public:
 
     SvPersistStream&    WritePointer( SvPersistBase * pObj );
     SvPersistStream&    ReadPointer( SvPersistBase * & rpObj );
-    TOOLS_DLLPUBLIC friend SvPersistStream& operator << (SvPersistStream &, SvPersistBase *);
+    TOOLS_DLLPUBLIC friend SvPersistStream& WriteSvPersistBase(SvPersistStream &, SvPersistBase *);
     TOOLS_DLLPUBLIC friend SvPersistStream& operator >> (SvPersistStream &, SvPersistBase * &);
 
     // Objects maintain their IDs while storing and loading to/from stream
     friend SvStream& operator >> ( SvStream &, SvPersistStream & );
-    friend SvStream& operator << ( SvStream &, SvPersistStream & );
+    friend SvStream& WriteSvPersistStream( SvStream &, SvPersistStream & );
 };
 
 #endif