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>

14 files changed, 19 insertions, 19 deletions

diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 966703832b1f..7d5c7310d7b0 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -229,7 +229,7 @@ public:
                                 const Link* pProgress = NULL
                             );
 
-    friend VCL_DLLPUBLIC SvStream&  operator>>( SvStream& rIStream, Animation& rAnimation );
+    friend VCL_DLLPUBLIC SvStream&  ReadAnimation( SvStream& rIStream, Animation& rAnimation );
     friend VCL_DLLPUBLIC SvStream&  WriteAnimation( SvStream& rOStream, const Animation& rAnimation );
 };
 
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index 8a2fb764282a..d49d647f3655 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -131,7 +131,7 @@ public:
                             { return !(Font::operator==( rFont )); }
     sal_Bool                IsSameInstance( const Font& ) const;
 
-    friend VCL_DLLPUBLIC SvStream&  operator>>( SvStream& rIStm, Font& );
+    friend VCL_DLLPUBLIC SvStream&  ReadFont( SvStream& rIStm, Font& );
     friend VCL_DLLPUBLIC SvStream&  WriteFont( SvStream& rOStm, const Font& );
 
     static Font identifyFont( const void* pBuffer, sal_uInt32 nLen );
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index a922709e59ee..a322f8e2cf4f 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -210,7 +210,7 @@ public:
 
     // Stream-operators write (still) the old format
     // and read both the old and the new format
-    friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile );
+    friend VCL_DLLPUBLIC SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile );
     friend VCL_DLLPUBLIC SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile );
 
     /// Creates an antialiased thumbnail, with maximum width or height of nMaximumExtent.
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 15c91705b2e9..1bf3f68e2691 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -174,7 +174,7 @@ public:
 public:
 
     friend VCL_DLLPUBLIC SvStream&  WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink );
-    friend VCL_DLLPUBLIC SvStream&  operator>>( SvStream& rIStream, GfxLink& rGfxLink );
+    friend VCL_DLLPUBLIC SvStream&  ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink );
 };
 
 #endif
diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx
index e0cb0f4fdce0..3a10dc083ee3 100644
--- a/include/vcl/gradient.hxx
+++ b/include/vcl/gradient.hxx
@@ -49,7 +49,7 @@ public:
     sal_uInt16          mnIntensityEnd;
     sal_uInt16          mnStepCount;
 
-    friend SvStream& operator>>( SvStream& rIStm, Impl_Gradient& rImplGradient );
+    friend SvStream& ReadImpl_Gradient( SvStream& rIStm, Impl_Gradient& rImplGradient );
     friend SvStream& WriteImpl_Gradient( SvStream& rOStm, const Impl_Gradient& rImplGradient );
 
                     Impl_Gradient();
@@ -109,7 +109,7 @@ public:
     sal_Bool            IsSameInstance( const Gradient& rGradient ) const
                         { return (mpImplGradient == rGradient.mpImplGradient); }
 
-    friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Gradient& rGradient );
+    friend VCL_DLLPUBLIC SvStream& ReadGradient( SvStream& rIStm, Gradient& rGradient );
     friend VCL_DLLPUBLIC SvStream& WriteGradient( SvStream& rOStm, const Gradient& rGradient );
 };
 
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 12221ece82d6..ec04cd7dcf57 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -189,7 +189,7 @@ public:
     sal_Bool                ExportNative( SvStream& rOStream ) const;
 
     friend VCL_DLLPUBLIC SvStream&    WriteGraphic( SvStream& rOStream, const Graphic& rGraphic );
-    friend VCL_DLLPUBLIC SvStream&    operator>>( SvStream& rIStream, Graphic& rGraphic );
+    friend VCL_DLLPUBLIC SvStream&    ReadGraphic( SvStream& rIStream, Graphic& rGraphic );
 
 public:
 
diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index ff170f56a255..0140b5df8384 100644
--- a/include/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
@@ -176,7 +176,7 @@ public:
 private:
     // friends
     VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass );
-    VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass );
+    VCL_DLLPUBLIC friend SvStream& ReadSvtGraphicStroke( SvStream& rIStm, SvtGraphicStroke& rClass );
 
     Polygon         maPath;
     PolyPolygon     maStartArrow;
@@ -353,7 +353,7 @@ public:
 private:
     // friends
     VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass );
-    VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass );
+    VCL_DLLPUBLIC friend SvStream& ReadSvtGraphicFill( SvStream& rIStm, SvtGraphicFill& rClass );
 
     PolyPolygon     maPath;
     Color           maFillColor;
diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx
index da669b3ad1e6..7ba89eb46598 100644
--- a/include/vcl/hatch.hxx
+++ b/include/vcl/hatch.hxx
@@ -42,7 +42,7 @@ struct ImplHatch
                         ImplHatch();
                         ImplHatch( const ImplHatch& rImplHatch );
 
-    friend SvStream&    operator>>( SvStream& rIStm, ImplHatch& rImplHatch );
+    friend SvStream&    ReadImplHatch( SvStream& rIStm, ImplHatch& rImplHatch );
     friend SvStream&    WriteImplHatch( SvStream& rOStm, const ImplHatch& rImplHatch );
 };
 
@@ -80,7 +80,7 @@ public:
     void            SetAngle( sal_uInt16 nAngle10 );
     sal_uInt16          GetAngle() const { return mpImplHatch->mnAngle; }
 
-    friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Hatch& rHatch );
+    friend VCL_DLLPUBLIC SvStream& ReadHatch( SvStream& rIStm, Hatch& rHatch );
     friend VCL_DLLPUBLIC SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch );
 };
 
diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx
index fb0f8ba8e8f9..180b4ba369f2 100644
--- a/include/vcl/jobset.hxx
+++ b/include/vcl/jobset.hxx
@@ -59,7 +59,7 @@ public:
     sal_Bool                operator!=( const JobSetup& rJobSetup ) const
                             { return !(JobSetup::operator==( rJobSetup )); }
 
-    friend VCL_DLLPUBLIC SvStream&  operator>>( SvStream& rIStream, JobSetup& rJobSetup );
+    friend VCL_DLLPUBLIC SvStream&  ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup );
     friend VCL_DLLPUBLIC SvStream&  WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup );
 };
 
diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx
index e1989704c336..9f72675786e3 100644
--- a/include/vcl/lineinfo.hxx
+++ b/include/vcl/lineinfo.hxx
@@ -52,7 +52,7 @@ struct ImplLineInfo
 
     bool operator==( const ImplLineInfo& ) const;
 
-    friend SvStream&    operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo );
+    friend SvStream&    ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo );
     friend SvStream&    WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo );
 };
 
@@ -108,7 +108,7 @@ public:
 
     sal_Bool            IsDefault() const;
 
-    friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo );
+    friend VCL_DLLPUBLIC SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo );
     friend VCL_DLLPUBLIC SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo );
 
     // helper to get decomposed polygon data with the LineInfo applied. The source
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index 17beccf14123..bfdc284fb35e 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -48,7 +48,7 @@ private:
     Fraction        maScaleY;
     sal_Bool            mbSimple;
 
-    friend SvStream& operator>>( SvStream& rIStm, ImplMapMode& rMapMode );
+    friend SvStream& ReadImplMapMode( SvStream& rIStm, ImplMapMode& rMapMode );
     friend SvStream& WriteImplMapMode( SvStream& rOStm, const ImplMapMode& rMapMode );
 
     static ImplMapMode* ImplGetStaticMapMode( MapUnit eUnit );
@@ -101,7 +101,7 @@ public:
     sal_Bool            IsSameInstance( const MapMode& rMapMode ) const
                         { return (mpImplMapMode == rMapMode.mpImplMapMode); }
 
-    friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode );
+    friend VCL_DLLPUBLIC SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode );
     friend VCL_DLLPUBLIC SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode );
 };
 
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 44ffa713527a..e0e113519bf5 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -114,7 +114,7 @@ public:
 
     bool operator==( const QueueInfo& rInfo ) const;
 
-    friend VCL_DLLPUBLIC SvStream&          operator>>( SvStream& rIStream, QueueInfo& rInfo );
+    friend VCL_DLLPUBLIC SvStream&          ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo );
     friend VCL_DLLPUBLIC SvStream&          WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo );
 };
 
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index 3a3a64b78dcd..af4941df5470 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -111,7 +111,7 @@ public:
     bool operator==( const Region& rRegion ) const;
     bool operator!=( const Region& rRegion ) const { return !(Region::operator==( rRegion )); }
 
-    friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Region& rRegion );
+    friend VCL_DLLPUBLIC SvStream& ReadRegion( SvStream& rIStm, Region& rRegion );
     friend VCL_DLLPUBLIC SvStream& WriteRegion( SvStream& rOStm, const Region& rRegion );
 
     /* workaround: faster conversion for PolyPolygons
diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index f7a46080e50e..4f4113f8a444 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -115,7 +115,7 @@ public:
     sal_Bool            IsSameInstance( const Wallpaper& rWallpaper ) const
                         { return (mpImplWallpaper == rWallpaper.mpImplWallpaper); }
 
-    friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper );
+    friend VCL_DLLPUBLIC SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper );
     friend VCL_DLLPUBLIC SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper );
 };