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>

6 files changed, 11 insertions, 11 deletions

diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 9ed8d618989b..2c3fc5ade570 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -217,7 +217,7 @@ SvStream& Color::Read( SvStream& rIStm, bool bNewFormat )
     if ( bNewFormat )
         rIStm >> mnColor;
     else
-        rIStm >> *this;
+        ReadColor( rIStm, *this );
 
     return rIStm;
 }
@@ -234,7 +234,7 @@ SvStream& Color::Write( SvStream& rOStm, bool bNewFormat )
 
 #define COL_NAME_USER       ((sal_uInt16)0x8000)
 
-SvStream& operator>>( SvStream& rIStream, Color& rColor )
+SvStream& ReadColor( SvStream& rIStream, Color& rColor )
 {
     DBG_ASSERTWARNING( rIStream.GetVersion(), "Color::>> - Solar-Version not set on rIStream" );
 
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index a8a550675ac6..0bfae055ac81 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -482,7 +482,7 @@ bool operator > ( const Fraction& rVal1, const Fraction& rVal2 )
     return nN > nD;
 }
 
-SvStream& operator >> ( SvStream& rIStream, Fraction& rFract )
+SvStream& ReadFraction( SvStream& rIStream, Fraction& rFract )
 {
     //fdo#39428 SvStream no longer supports operator>>(long&)
     sal_Int32 nTmp(0);
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index 9643a8115219..0a49fd40bb5f 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@@ -21,7 +21,7 @@
 #include <tools/gen.hxx>
 #include <tools/stream.hxx>
 
-SvStream& operator>>( SvStream& rIStream, Pair& rPair )
+SvStream& ReadPair( SvStream& rIStream, Pair& rPair )
 {
     DBG_ASSERTWARNING( rIStream.GetVersion(), "Pair::>> - Solar-Version not set on rIStream" );
 
@@ -169,7 +169,7 @@ bool Rectangle::IsOver( const Rectangle& rRect ) const
     return !GetIntersection( rRect ).IsEmpty();
 }
 
-SvStream& operator>>( SvStream& rIStream, Rectangle& rRect )
+SvStream& ReadRectangle( SvStream& rIStream, Rectangle& rRect )
 {
     DBG_ASSERTWARNING( rIStream.GetVersion(), "Rectangle::>> - Solar-Version not set on rIStream" );
 
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 538a608b4aee..2da3bb396694 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -1501,7 +1501,7 @@ bool Polygon::IsEqual( const Polygon& rPoly ) const
     return bIsEqual;
 }
 
-SvStream& operator>>( SvStream& rIStream, Polygon& rPoly )
+SvStream& ReadPolygon( SvStream& rIStream, Polygon& rPoly )
 {
     DBG_ASSERTWARNING( rIStream.GetVersion(), "Polygon::>> - Solar-Version not set on rIStream" );
 
@@ -1590,8 +1590,8 @@ void Polygon::ImplRead( SvStream& rIStream )
 {
     sal_uInt8   bHasPolyFlags;
 
-    rIStream >> *this
-             >> bHasPolyFlags;
+    ReadPolygon( rIStream, *this );
+    rIStream >> bHasPolyFlags;
 
     if ( bHasPolyFlags )
     {
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index affa44debc81..c168196ee2ff 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -553,7 +553,7 @@ bool PolyPolygon::IsEqual( const PolyPolygon& rPolyPoly ) const
     return bIsEqual;
 }
 
-SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly )
+SvStream& ReadPolyPolygon( SvStream& rIStream, PolyPolygon& rPolyPoly )
 {
     DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" );
 
@@ -575,7 +575,7 @@ SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly )
         for ( sal_uInt16 i = 0; i < nPolyCount; i++ )
         {
             pPoly = new Polygon;
-            rIStream >> *pPoly;
+            ReadPolygon( rIStream, *pPoly );
             rPolyPoly.mpImplPolyPolygon->mpPolyAry[i] = pPoly;
         }
     }
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 427cc26cbc78..7bc94e5ecb0d 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -135,7 +135,7 @@ SvStream& INetMessage::operator>> (SvStream& rStrm)
     for (i = 0; i < n; i++)
     {
         INetMessageHeader *p = new INetMessageHeader();
-        rStrm >> *p;
+        ReadINetMessageHeader( rStrm, *p );
         m_aHeaderList.push_back( p );
     }