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>

29 files changed, 52 insertions, 52 deletions

diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx
index 92976810350e..6237e8d84485 100644
--- a/include/filter/msfilter/dffpropset.hxx
+++ b/include/filter/msfilter/dffpropset.hxx
@@ -61,7 +61,7 @@ class MSFILTER_DLLPUBLIC DffPropSet
         sal_Bool        SeekToContent( sal_uInt32 nRecType, SvStream& rSt ) const;
         void        InitializePropSet( sal_uInt16 nPropSetType ) const;
 
-        friend SvStream& operator>>( SvStream& rIn, DffPropSet& rPropSet );
+        friend SvStream& ReadDffPropSet( SvStream& rIn, DffPropSet& rPropSet );
         friend SvStream& operator|=( SvStream& rIn, DffPropSet& rPropSet );
 };
 
diff --git a/include/filter/msfilter/dffrecordheader.hxx b/include/filter/msfilter/dffrecordheader.hxx
index 9453a0dd5f90..a36521785f8a 100644
--- a/include/filter/msfilter/dffrecordheader.hxx
+++ b/include/filter/msfilter/dffrecordheader.hxx
@@ -56,7 +56,7 @@ public:
         return nFilePos == rIn.Seek(nFilePos);
     }
 
-    MSFILTER_DLLPUBLIC friend SvStream& operator>>(SvStream& rIn, DffRecordHeader& rRec);
+    MSFILTER_DLLPUBLIC friend SvStream& ReadDffRecordHeader(SvStream& rIn, DffRecordHeader& rRec);
 };
 
 #endif
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 37157e539eb6..c2bf0391c26b 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -179,7 +179,7 @@ struct SvxMSDffConnectorRule
     SvxMSDffConnectorRule() : nSpFlagsA( 0 ), nSpFlagsB( 0 ), pAObj( NULL ),
                               pBObj( NULL ), pCObj( NULL ) {};
 
-    friend SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rAtom );
+    friend SvStream& ReadSvxMSDffConnectorRule( SvStream& rIn, SvxMSDffConnectorRule& rAtom );
 };
 
 typedef ::std::vector< SvxMSDffConnectorRule* > SvxMSDffConnectorRuleList;
@@ -191,7 +191,7 @@ struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer
     SvxMSDffSolverContainer();
     ~SvxMSDffSolverContainer();
 
-    MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, SvxMSDffSolverContainer& rAtom );
+    MSFILTER_DLLPUBLIC friend SvStream& ReadSvxMSDffSolverContainer( SvStream& rIn, SvxMSDffSolverContainer& rAtom );
 };
 
 struct FIDCL
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index eee319253955..f76123abcb68 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -73,7 +73,7 @@ public:
                             nMajorVersion       ( 0 ),
                             nMinorVersion       ( 0 ) {}
 
-    MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptCurrentUserAtom& rAtom );
+    MSFILTER_DLLPUBLIC friend SvStream& ReadPptCurrentUserAtom( SvStream& rIn, PptCurrentUserAtom& rAtom );
 };
 
 struct MSFILTER_DLLPUBLIC PowerPointImportParam
@@ -121,7 +121,7 @@ struct MSFILTER_DLLPUBLIC PptInteractiveInfoAtom
 
 public:
 
-    MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom );
+    MSFILTER_DLLPUBLIC friend SvStream& ReadPptInteractiveInfoAtom( SvStream& rIn, PptInteractiveInfoAtom& rAtom );
 };
 
 enum PptPageKind { PPT_MASTERPAGE, PPT_SLIDEPAGE, PPT_NOTEPAGE };
@@ -188,7 +188,7 @@ public:
     Size    GetSlidesPageSize() const { return GetPageSize( aSlidesPageSize ); }
     Size    GetNotesPageSize() const { return GetPageSize( aNotesPageSize ); }
 
-    friend SvStream& operator>>( SvStream& rIn, PptDocumentAtom& rAtom );
+    friend SvStream& ReadPptDocumentAtom( SvStream& rIn, PptDocumentAtom& rAtom );
 };
 
 struct PptSlideLayoutAtom
@@ -201,7 +201,7 @@ public:
     void                Clear();
 
     // SlideLayoutAtom is read without header!
-    friend SvStream& operator>>( SvStream& rIn, PptSlideLayoutAtom& rAtom );
+    friend SvStream& ReadPptSlideLayoutAtom( SvStream& rIn, PptSlideLayoutAtom& rAtom );
 };
 
 struct PptSlideAtom
@@ -215,7 +215,7 @@ public:
                         PptSlideAtom() { Clear(); }
     void                Clear();
 
-    friend SvStream& operator>>(SvStream& rIn, PptSlideAtom& rAtom);
+    friend SvStream& ReadPptSlideAtom(SvStream& rIn, PptSlideAtom& rAtom);
 };
 
 struct PptSlidePersistAtom
@@ -230,7 +230,7 @@ public:
                         PptSlidePersistAtom() { Clear(); }
     void                Clear();
 
-    friend SvStream& operator>>(SvStream& rIn, PptSlidePersistAtom& rAtom);
+    friend SvStream& ReadPptSlidePersistAtom(SvStream& rIn, PptSlidePersistAtom& rAtom);
 };
 
 struct PptNotesAtom
@@ -242,7 +242,7 @@ public:
                         PptNotesAtom() { Clear(); }
     void                Clear();
 
-    friend SvStream& operator>>(SvStream& rIn, PptNotesAtom& rAtom);
+    friend SvStream& ReadPptNotesAtom(SvStream& rIn, PptNotesAtom& rAtom);
 };
 
 struct PptColorSchemeAtom
@@ -254,7 +254,7 @@ public:
     void                Clear();
     Color               GetColor( sal_uInt16 nNum ) const;
 
-    friend SvStream& operator>>(SvStream& rIn, PptColorSchemeAtom& rAtom);
+    friend SvStream& ReadPptColorSchemeAtom(SvStream& rIn, PptColorSchemeAtom& rAtom);
 };
 
 struct PptFontEntityAtom
@@ -270,7 +270,7 @@ struct PptFontEntityAtom
     FontPitch           ePitch;
     sal_Bool            bAvailable;
 
-    friend SvStream& operator>>(SvStream& rIn, PptFontEntityAtom& rAtom);
+    friend SvStream& ReadPptFontEntityAtom(SvStream& rIn, PptFontEntityAtom& rAtom);
 };
 
 class PptFontCollection;
@@ -288,7 +288,7 @@ struct PptUserEditAtom
 public:
     PptUserEditAtom() : nOffsetPersistDirectory( 0 ) {}
 
-    friend SvStream& operator>>( SvStream& rIn, PptUserEditAtom& rAtom );
+    friend SvStream& ReadPptUserEditAtom( SvStream& rIn, PptUserEditAtom& rAtom );
 };
 
 struct PptOEPlaceholderAtom
@@ -301,7 +301,7 @@ public:
                         PptOEPlaceholderAtom() { Clear(); }
     void                Clear();
 
-    friend SvStream& operator>>( SvStream& rIn, PptOEPlaceholderAtom& rAtom );
+    friend SvStream& ReadPptOEPlaceholderAtom( SvStream& rIn, PptOEPlaceholderAtom& rAtom );
 };
 
 struct ProcessData;
@@ -382,7 +382,7 @@ struct PptExOleObjAtom
 
 public:
 
-    friend SvStream& operator>>( SvStream& rIn, PptExOleObjAtom& rAtom );
+    friend SvStream& ReadPptExOleObjAtom( SvStream& rIn, PptExOleObjAtom& rAtom );
 };
 
 typedef ::std::vector< PPTOleEntry* > PPTOleEntryList;
@@ -691,7 +691,7 @@ struct PPTExtParaLevel
     sal_Bool    mbSet;
 
     PPTExtParaLevel();
-    friend SvStream& operator>>( SvStream& rIn, PPTExtParaLevel& rL );
+    friend SvStream& ReadPPTExtParaLevel( SvStream& rIn, PPTExtParaLevel& rL );
 };
 
 struct PPTExtParaSheet
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index 6149ddfc85bf..220b5121adf2 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -52,7 +52,7 @@ public:
 
     // Im-/Export
     SOT_DLLPUBLIC friend SvStream&  WriteFileList( SvStream& rOStm, const FileList& rFileList );
-    SOT_DLLPUBLIC friend SvStream&  operator>>( SvStream& rIStm, FileList& rFileList );
+    SOT_DLLPUBLIC friend SvStream&  ReadFileList( SvStream& rIStm, FileList& rFileList );
 
     // Liste fuellen/abfragen
     void AppendFile( const OUString& rStr );
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 8e0a330e1596..88ba220ce3e9 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -151,7 +151,7 @@ public:
                     }
 
     friend SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr );
-    friend SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr );
+    friend SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr );
 };
 
 class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream
@@ -485,7 +485,7 @@ public:
     void                    StopAnimation( OutputDevice* pOut = NULL, long nExtraData = 0L );
 
     friend SvStream&        WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj );
-    friend SvStream&        operator>>( SvStream& rIStm, GraphicObject& rGraphicObj );
+    friend SvStream&        ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj );
 
     static GraphicObject    CreateGraphicObjectFromURL( const OUString &rURL );
     // will inspect an object ( e.g. a control ) for any 'ImageURL'
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 89e8130ed8e4..7e97838dbe1c 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -79,7 +79,7 @@ struct TransferableObjectDescriptor
         , mbCanLink(false)
     {}
 
-    SVT_DLLPUBLIC friend SvStream&  operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc );
+    SVT_DLLPUBLIC friend SvStream&  ReadTransferableObjectDescriptor( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc );
     SVT_DLLPUBLIC friend SvStream&  WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
 };
 
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index f657a0085e03..0f76524abfec 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -231,7 +231,7 @@ public:
 };
 
 SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme );
-SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme );
+SvStream& ReadGalleryTheme( SvStream& rIn, GalleryTheme& rTheme );
 
 #endif
 
diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx
index 18a15a716fb5..150d29a3dd73 100644
--- a/include/svx/svdsob.hxx
+++ b/include/svx/svdsob.hxx
@@ -91,7 +91,7 @@ public:
     void operator|=(const SetOfByte& r2ndSet);
 
     friend inline SvStream& WriteSetOfByte(SvStream& rOut, const SetOfByte& rSet);
-    friend inline SvStream& operator>>(SvStream& rIn, SetOfByte& rSet);
+    friend inline SvStream& ReadSetOfByte(SvStream& rIn, SetOfByte& rSet);
 
     // initialize this set with a uno sequence of sal_Int8
     void PutValue(const com::sun::star::uno::Any & rAny);
@@ -106,7 +106,7 @@ inline SvStream& WriteSetOfByte(SvStream& rOut, const SetOfByte& rSet)
     return rOut;
 }
 
-inline SvStream& operator>>(SvStream& rIn, SetOfByte& rSet)
+inline SvStream& ReadSetOfByte(SvStream& rIn, SetOfByte& rSet)
 {
     rIn.Read((char*)rSet.aData,32);
     return rIn;
diff --git a/include/svx/xexch.hxx b/include/svx/xexch.hxx
index 4cba3bca8833..0154adfc9e2e 100644
--- a/include/svx/xexch.hxx
+++ b/include/svx/xexch.hxx
@@ -49,7 +49,7 @@ public:
                         XFillExchangeData& operator=( const XFillExchangeData& rXFillExchangeData );
 
     SVX_DLLPUBLIC friend SvStream&    WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData );
-    SVX_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStm, XFillExchangeData& rXFillExchangeData );
+    SVX_DLLPUBLIC friend SvStream&    ReadXFillExchangeData( SvStream& rIStm, XFillExchangeData& rXFillExchangeData );
 
     XFillAttrSetItem*   GetXFillAttrSetItem() { return pXFillAttrSetItem; }
 };
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 626f6255a990..9fedd25f4c5b 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -160,7 +160,7 @@ public:
     SvStream&           Read( SvStream& rIStm, bool bNewFormat = true );
     SvStream&           Write( SvStream& rOStm, bool bNewFormat = true );
 
-    TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Color& rColor );
+    TOOLS_DLLPUBLIC friend SvStream&    ReadColor( SvStream& rIStream, Color& rColor );
     TOOLS_DLLPUBLIC friend SvStream&    WriteColor( SvStream& rOStream, const Color& rColor );
 
     // get ::basegfx::BColor from this color
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index 2e1bb2005e4d..41820e71c377 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -65,7 +65,7 @@ public:
     friend inline   bool operator<=( const Fraction& rVal1, const Fraction& rVal2 );
     friend inline   bool operator>=( const Fraction& rVal1, const Fraction& rVal2 );
 
-    TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Fraction& rFract );
+    TOOLS_DLLPUBLIC friend SvStream& ReadFraction( SvStream& rIStream, Fraction& rFract );
     TOOLS_DLLPUBLIC friend SvStream& WriteFraction( SvStream& rOStream, const Fraction& rFract );
 };
 
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index e3a33ca4f8c1..bc3fb35dd5ab 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -45,7 +45,7 @@ public:
     bool                operator == ( const Pair& rPair ) const;
     bool                operator != ( const Pair& rPair ) const;
 
-    TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Pair& rPair );
+    TOOLS_DLLPUBLIC friend SvStream&    ReadPair( SvStream& rIStream, Pair& rPair );
     TOOLS_DLLPUBLIC friend SvStream&    WritePair( SvStream& rOStream, const Pair& rPair );
 
 protected:
@@ -417,7 +417,7 @@ public:
     friend inline Rectangle operator + ( const Rectangle& rRect, const Point& rPt );
     friend inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt );
 
-    TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, Rectangle& rRect );
+    TOOLS_DLLPUBLIC friend SvStream&    ReadRectangle( SvStream& rIStream, Rectangle& rRect );
     TOOLS_DLLPUBLIC friend SvStream&    WriteRectangle( SvStream& rOStream, const Rectangle& rRect );
 
     // ONE
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index 4c07726bed42..1f9e47715e71 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -70,7 +70,7 @@ public:
         return rStrm;
     }
 
-    friend SvStream& operator>> (
+    friend SvStream& ReadINetMessageHeader (
         SvStream& rStrm, INetMessageHeader& rHdr)
     {
         rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStrm);
@@ -200,7 +200,7 @@ public:
         return rMsg.operator<< (rStrm);
     }
 
-    friend SvStream& operator>> (
+    friend SvStream& ReadINetMessage (
         SvStream& rStrm, INetMessage& rMsg)
     {
         return rMsg.operator>> (rStrm);
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index ce96dc5ad008..5f5171c99005 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -177,7 +177,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&    ReadPolygon( SvStream& rIStream, Polygon& rPoly );
     TOOLS_DLLPUBLIC friend SvStream&    WritePolygon( SvStream& rOStream, const Polygon& rPoly );
 
     void                Read( SvStream& rIStream );
@@ -262,7 +262,7 @@ public:
 
     bool                IsEqual( const PolyPolygon& rPolyPoly ) const;
 
-    TOOLS_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly );
+    TOOLS_DLLPUBLIC friend SvStream&    ReadPolyPolygon( SvStream& rIStream, PolyPolygon& rPolyPoly );
     TOOLS_DLLPUBLIC friend SvStream&    WritePolyPolygon( SvStream& rOStream, const PolyPolygon& rPolyPoly );
 
     void                Read( SvStream& rIStream );
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 );
 };