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>

30 files changed, 247 insertions, 199 deletions

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 0a9266013f99..0bdd8edb2969 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -82,7 +82,7 @@ private:
                         mbVertical:1,
                         mbTransparent:1;    // compatibility, now on output device
 
-    friend SvStream&    operator>>( SvStream& rIStm, Impl_Font& );
+    friend SvStream&    ReadImpl_Font( SvStream& rIStm, Impl_Font& );
     friend SvStream&    WriteImpl_Font( SvStream& rOStm, const Impl_Font& );
 };
 
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 76cacb7f8f47..6926aee63c64 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -161,7 +161,7 @@ private:
     sal_Bool                ImplExportNative( SvStream& rOStm ) const;
 
     friend SvStream&    WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic );
-    friend SvStream&    operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic );
+    friend SvStream&    ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic );
 
     // SvgData support
     const SvgDataPtr& getSvgData() const;
diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx
index c6329b6abbe4..14c5e1fa753b 100644
--- a/vcl/inc/wall2.hxx
+++ b/vcl/inc/wall2.hxx
@@ -35,7 +35,7 @@ private:
     sal_uLong           mnRefCount;
     BitmapEx*       mpCache;
 
-    friend SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper );
+    friend SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper );
     friend SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper );
 
 public:
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 67e1d2bc1700..a1a731eeaed3 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1573,13 +1573,13 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
                     aFilterName.equalsIgnoreAsciiCase( IMP_SVMETAFILE ) )
         {
             // SV internal filters for import bitmaps and MetaFiles
-            rIStream >> rGraphic;
+            ReadGraphic( rIStream, rGraphic );
             if( rIStream.GetError() )
                 nStatus = GRFILTER_FORMATERROR;
         }
         else if( aFilterName.equalsIgnoreAsciiCase( IMP_MOV ) )
         {
-            rIStream >> rGraphic;
+            ReadGraphic( rIStream, rGraphic );
             if( rIStream.GetError() )
                 nStatus = GRFILTER_FORMATERROR;
             else
@@ -1620,7 +1620,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
                     else
                     {
                         aTempStream.Seek( 0L );
-                        aTempStream >> rGraphic;
+                        ReadGraphic( aTempStream, rGraphic );
 
                         if( aTempStream.GetError() )
                             nStatus = GRFILTER_FILTERERROR;
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index 352e4de56c96..c2d169e06d93 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -1065,8 +1065,8 @@ sal_Bool GraphicDescriptor::ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo
                     MapMode aMapMode;
 
                     rStm.SeekRel( 0x06 );
-                    rStm >> aMapMode;
-                    rStm >> aLogSize;
+                    ReadMapMode( rStm, aMapMode );
+                    ReadPair( rStm, aLogSize );
                     aLogSize = OutputDevice::LogicToLogic( aLogSize, aMapMode, MapMode( MAP_100TH_MM ) );
                 }
             }
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index 92a4334ce129..c9ac38865640 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -27,7 +27,7 @@
 #include "sgffilt.hxx"
 #include "sgfbram.hxx"
 
-SvStream& operator>>(SvStream& rIStream, SgfHeader& rHead)
+SvStream& ReadSgfHeader(SvStream& rIStream, SgfHeader& rHead)
 {
     rIStream.Read((char*)&rHead.Magic,SgfHeaderSize);
 #if defined OSL_BIGENDIAN
@@ -52,7 +52,7 @@ bool SgfHeader::ChkMagic()
 sal_uInt32 SgfHeader::GetOffset()
 { return sal_uInt32(OfsLo)+0x00010000*sal_uInt32(OfsHi); }
 
-SvStream& operator>>(SvStream& rIStream, SgfEntry& rEntr)
+SvStream& ReadSgfEntry(SvStream& rIStream, SgfEntry& rEntr)
 {
     rIStream.Read((char*)&rEntr.Typ,SgfEntrySize);
 #if defined OSL_BIGENDIAN
@@ -69,7 +69,7 @@ SvStream& operator>>(SvStream& rIStream, SgfEntry& rEntr)
 sal_uInt32 SgfEntry::GetOffset()
 { return sal_uInt32(OfsLo)+0x00010000*sal_uInt32(OfsHi); }
 
-SvStream& operator>>(SvStream& rIStream, SgfVector& rVect)
+SvStream& ReadSgfVector(SvStream& rIStream, SgfVector& rVect)
 {
     rIStream.Read((char*)&rVect,sizeof(rVect));
 #if defined OSL_BIGENDIAN
@@ -337,13 +337,13 @@ bool SgfBMapFilter(SvStream& rInp, SvStream& rOut)
     bool      bRet=false;            // return value
 
     nFileStart=rInp.Tell();
-    rInp>>aHead;
+    ReadSgfHeader( rInp, aHead );
     if (aHead.ChkMagic() && (aHead.Typ==SgfBitImag0 || aHead.Typ==SgfBitImag1 ||
                              aHead.Typ==SgfBitImag2 || aHead.Typ==SgfBitImgMo)) {
         nNext=aHead.GetOffset();
         while (nNext && !bRdFlag && !rInp.GetError() && !rOut.GetError()) {
             rInp.Seek(nFileStart+nNext);
-            rInp>>aEntr;
+            ReadSgfEntry( rInp, aEntr );
             nNext=aEntr.GetOffset();
             if (aEntr.Typ==aHead.Typ) {
                 bRdFlag=true;
@@ -415,7 +415,7 @@ bool SgfFilterVect(SvStream& rInp, SgfHeader& rHead, SgfEntry&, GDIMetaFile& rMt
     aOutDev.SetFillColor(Color(COL_BLACK));
 
     while (!bEoDt && !rInp.GetError()) {
-        rInp>>aVect; RecNr++;
+        ReadSgfVector( rInp, aVect ); RecNr++;
         nFarb=(sal_uInt8) (aVect.Flag & 0x000F);
         nLTyp=(sal_uInt8)((aVect.Flag & 0x00F0) >>4);
         nOTyp=(sal_uInt8)((aVect.Flag & 0x0F00) >>8);
@@ -472,12 +472,12 @@ bool SgfVectFilter(SvStream& rInp, GDIMetaFile& rMtf)
     bool      bRet=false;            // return value
 
     nFileStart=rInp.Tell();
-    rInp>>aHead;
+    ReadSgfHeader( rInp, aHead );
     if (aHead.ChkMagic() && aHead.Typ==SGF_SIMPVECT) {
         nNext=aHead.GetOffset();
         while (nNext && !rInp.GetError()) {
             rInp.Seek(nFileStart+nNext);
-            rInp>>aEntr;
+            ReadSgfEntry( rInp, aEntr );
             nNext=aEntr.GetOffset();
             if (aEntr.Typ==aHead.Typ) {
                 bRet=SgfFilterVect(rInp,aHead,aEntr,rMtf);
@@ -509,7 +509,7 @@ sal_uInt8 CheckSgfTyp(SvStream& rInp, sal_uInt16& nVersion)
     SgfHeader aHead;
     nVersion=0;
     nPos=rInp.Tell();
-    rInp>>aHead;
+    ReadSgfHeader( rInp, aHead );
     rInp.Seek(nPos);
     if (aHead.ChkMagic()) {
         nVersion=aHead.Version;
diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx
index 1af6f56ef815..cd34217edc9c 100644
--- a/vcl/source/filter/sgfbram.hxx
+++ b/vcl/source/filter/sgfbram.hxx
@@ -56,7 +56,7 @@ public:
     sal_uInt16 OfsLo,OfsHi; // DWord allignment is necessary (38 mod 4 =2) !
 
     sal_uInt32 GetOffset();
-    friend SvStream& operator>>(SvStream& rIStream, SgfHeader& rHead);
+    friend SvStream& ReadSgfHeader(SvStream& rIStream, SgfHeader& rHead);
     bool   ChkMagic();
 };
 
@@ -71,7 +71,7 @@ public:
     sal_uInt16 OfsLo,OfsHi; // DWord allignment is necessary (18 mod 4 =2) !
 
     sal_uInt32 GetOffset();
-    friend SvStream& operator>>(SvStream& rIStream, SgfEntry& rEntr);
+    friend SvStream& ReadSgfEntry(SvStream& rIStream, SgfEntry& rEntr);
 };
 
 #define SgfVectorSize 10
@@ -83,7 +83,7 @@ public:
     sal_Int16 y;
     sal_uInt16 OfsLo,OfsHi; // DWord allignment is necessary (6 mod 4 =2) !
 
-    friend SvStream& operator>>(SvStream& rIStream, SgfVector& rEntr);
+    friend SvStream& ReadSgfVector(SvStream& rIStream, SgfVector& rEntr);
 };
 
 extern long SgfVectXofs;
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index f6eb1ee98bc9..7b4648e03fea 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -144,7 +144,7 @@ sal_uInt16 MulDiv(sal_uInt16 a, sal_uInt16 Mul, sal_uInt16 Div)
 // SgfFilterSDrw ///////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SvStream& operator>>(SvStream& rIStream, DtHdType& rDtHd)
+SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd)
 {
     rIStream.Read((char*)&rDtHd.Reserved[0],DtHdSize);
     return rIStream;
@@ -158,7 +158,7 @@ void DtHdOverSeek(SvStream& rInp)
 }
 
 
-SvStream& operator>>(SvStream& rIStream, PageType& rPage)
+SvStream& ReadPageType(SvStream& rIStream, PageType& rPage)
 {
     rIStream.Read((char*)&rPage.Next,PageSize);
 #if defined OSL_BIGENDIAN
@@ -174,7 +174,7 @@ void ObjkOverSeek(SvStream& rInp, ObjkType& rObjk)
     rInp.Seek(rInp.Tell()+Siz);
 }
 
-SvStream& operator>>(SvStream& rInp, ObjkType& rObjk)
+SvStream& ReadObjkType(SvStream& rInp, ObjkType& rObjk)
 {
     // fileposition in stream is not changed!
     sal_uLong nPos;
@@ -193,7 +193,7 @@ SvStream& operator>>(SvStream& rInp, ObjkType& rObjk)
 #endif
     return rInp;
 }
-SvStream& operator>>(SvStream& rInp, StrkType& rStrk)
+SvStream& ReadStrkType(SvStream& rInp, StrkType& rStrk)
 {
     rInp.Read((char*)&rStrk.Last,StrkSize);
 #if defined OSL_BIGENDIAN
@@ -204,7 +204,7 @@ SvStream& operator>>(SvStream& rInp, StrkType& rStrk)
 #endif
     return rInp;
 }
-SvStream& operator>>(SvStream& rInp, RectType& rRect)
+SvStream& ReadRectType(SvStream& rInp, RectType& rRect)
 {
     rInp.Read((char*)&rRect.Last,RectSize);
 #if defined OSL_BIGENDIAN
@@ -219,7 +219,7 @@ SvStream& operator>>(SvStream& rInp, RectType& rRect)
 #endif
     return rInp;
 }
-SvStream& operator>>(SvStream& rInp, PolyType& rPoly)
+SvStream& ReadPolyType(SvStream& rInp, PolyType& rPoly)
 {
     rInp.Read((char*)&rPoly.Last,PolySize);
 #if defined OSL_BIGENDIAN
@@ -229,7 +229,7 @@ SvStream& operator>>(SvStream& rInp, PolyType& rPoly)
 #endif
     return rInp;
 }
-SvStream& operator>>(SvStream& rInp, SplnType& rSpln)
+SvStream& ReadSplnType(SvStream& rInp, SplnType& rSpln)
 {
     rInp.Read((char*)&rSpln.Last,SplnSize);
 #if defined OSL_BIGENDIAN
@@ -239,7 +239,7 @@ SvStream& operator>>(SvStream& rInp, SplnType& rSpln)
 #endif
     return rInp;
 }
-SvStream& operator>>(SvStream& rInp, CircType& rCirc)
+SvStream& ReadCircType(SvStream& rInp, CircType& rCirc)
 {
     rInp.Read((char*)&rCirc.Last,CircSize);
 #if defined OSL_BIGENDIAN
@@ -254,7 +254,7 @@ SvStream& operator>>(SvStream& rInp, CircType& rCirc)
 #endif
     return rInp;
 }
-SvStream& operator>>(SvStream& rInp, TextType& rText)
+SvStream& ReadTextType(SvStream& rInp, TextType& rText)
 {
     rInp.Read((char*)&rText.Last,TextSize);
 #if defined OSL_BIGENDIAN
@@ -272,7 +272,7 @@ SvStream& operator>>(SvStream& rInp, TextType& rText)
     rText.Buffer=NULL;
     return rInp;
 }
-SvStream& operator>>(SvStream& rInp, BmapType& rBmap)
+SvStream& ReadBmapType(SvStream& rInp, BmapType& rBmap)
 {
     rInp.Read((char*)&rBmap.Last,BmapSize);
 #if defined OSL_BIGENDIAN
@@ -286,7 +286,7 @@ SvStream& operator>>(SvStream& rInp, BmapType& rBmap)
 #endif
     return rInp;
 }
-SvStream& operator>>(SvStream& rInp, GrupType& rGrup)
+SvStream& ReadGrupType(SvStream& rInp, GrupType& rGrup)
 {
     rInp.Read((char*)&rGrup.Last,GrupSize);
 #if defined OSL_BIGENDIAN
@@ -768,15 +768,15 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
     sal_uInt16 nGrpCnt=0;
     bool bEnde=false;
     do {
-        rInp>>aObjk;
+        ReadObjkType( rInp, aObjk );
         if (!rInp.GetError()) {
             switch(aObjk.Art) {
-                case ObjStrk: { StrkType aStrk; rInp>>aStrk; if (!rInp.GetError()) aStrk.Draw(rOut); } break;
-                case ObjRect: { RectType aRect; rInp>>aRect; if (!rInp.GetError()) aRect.Draw(rOut); } break;
-                case ObjCirc: { CircType aCirc; rInp>>aCirc; if (!rInp.GetError()) aCirc.Draw(rOut); } break;
+                case ObjStrk: { StrkType aStrk; ReadStrkType( rInp, aStrk ); if (!rInp.GetError()) aStrk.Draw(rOut); } break;
+                case ObjRect: { RectType aRect; ReadRectType( rInp, aRect ); if (!rInp.GetError()) aRect.Draw(rOut); } break;
+                case ObjCirc: { CircType aCirc; ReadCircType( rInp, aCirc ); if (!rInp.GetError()) aCirc.Draw(rOut); } break;
                 case ObjText: {
                     TextType aText;
-                    rInp>>aText;
+                    ReadTextType( rInp, aText );
                     if (!rInp.GetError()) {
                         aText.Buffer=new UCHAR[aText.BufSize+1]; // add one for LookAhead at CK-separation
                         rInp.Read((char* )aText.Buffer,aText.BufSize);
@@ -786,14 +786,14 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
                 } break;
                 case ObjBmap: {
                     BmapType aBmap;
-                    rInp>>aBmap;
+                    ReadBmapType( rInp, aBmap );
                     if (!rInp.GetError()) {
                         aBmap.Draw(rOut);
                     }
                 } break;
                 case ObjPoly: {
                     PolyType aPoly;
-                    rInp>>aPoly;
+                    ReadPolyType( rInp, aPoly );
                     if (!rInp.GetError()) {
                         aPoly.EckP=new PointType[aPoly.nPoints];
                         rInp.Read((char*)aPoly.EckP,4*aPoly.nPoints);
@@ -806,7 +806,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
                 } break;
                 case ObjSpln: {
                     SplnType aSpln;
-                    rInp>>aSpln;
+                    ReadSplnType( rInp, aSpln );
                     if (!rInp.GetError()) {
                         aSpln.EckP=new PointType[aSpln.nPoints];
                         rInp.Read((char*)aSpln.EckP,4*aSpln.nPoints);
@@ -819,7 +819,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
                 } break;
                 case ObjGrup: {
                     GrupType aGrup;
-                    rInp>>aGrup;
+                    ReadGrupType( rInp, aGrup );
                     if (!rInp.GetError()) {
                         rInp.Seek(rInp.Tell()+aGrup.Last);   // object appendix
                         if(aGrup.GetSubPtr()!=0L) nGrpCnt++; // DrawObjkList(rInp,rOut );
@@ -852,10 +852,10 @@ void SkipObjkList(SvStream& rInp)
     ObjkType aObjk;
     do
     {
-        rInp>>aObjk;
+        ReadObjkType( rInp, aObjk );
         if(aObjk.Art==ObjGrup) {
             GrupType aGrup;
-            rInp>>aGrup;
+            ReadGrupType( rInp, aGrup );
             rInp.Seek(rInp.Tell()+aGrup.Last); // object appendix
             if(aGrup.GetSubPtr()!=0L) SkipObjkList(rInp);
         } else {
@@ -884,28 +884,28 @@ bool SgfFilterSDrw( SvStream& rInp, SgfHeader&, SgfEntry&, GDIMetaFile& rMtf )
 
     nStdPos=rInp.Tell();
     do {                // read standard page
-        rInp>>aPage;
+        ReadPageType( rInp, aPage );
         if (aPage.nList!=0) SkipObjkList(rInp);
     } while (aPage.Next!=0L && !rInp.GetError());
 
 //    ShowMsg("Drawingpage(n)\n");
     nZchPos=rInp.Tell();
-    rInp>>aPage;
+    ReadPageType( rInp, aPage );
 
     rMtf.Record(pOutDev);
     Num=aPage.StdPg;
     if (Num!=0) {
       rInp.Seek(nStdPos);
       while(Num>1 && aPage.Next!=0L && !rInp.GetError()) { // search standard page
-        rInp>>aPage;
+        ReadPageType( rInp, aPage );
         if (aPage.nList!=0) SkipObjkList(rInp);
         Num--;
       }
-      rInp>>aPage;
+      ReadPageType( rInp, aPage );
       if(Num==1 && aPage.nList!=0L) DrawObjkList( rInp,*pOutDev );
       rInp.Seek(nZchPos);
       nZchPos=rInp.Tell();
-      rInp>>aPage;
+      ReadPageType( rInp, aPage );
     }
     if (aPage.nList!=0L) DrawObjkList(rInp,*pOutDev );
 
@@ -943,12 +943,12 @@ bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath )
 
     pSgfFonts->AssignFN( aIniPath.GetMainURL( INetURLObject::NO_DECODE ) );
     nFileStart=rInp.Tell();
-    rInp>>aHead;
+    ReadSgfHeader( rInp, aHead );
     if (aHead.ChkMagic() && aHead.Typ==SgfStarDraw && aHead.Version==SGV_VERSION) {
         nNext=aHead.GetOffset();
         while (nNext && !rInp.GetError()) {
             rInp.Seek(nFileStart+nNext);
-            rInp>>aEntr;
+            ReadSgfEntry( rInp, aEntr );
             nNext=aEntr.GetOffset();
             if (aEntr.Typ==aHead.Typ) {
                 bRet=SgfFilterSDrw( rInp,aHead,aEntr,rMtf );
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index 8dbc5955bb2d..3c58f128e512 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -37,7 +37,7 @@ struct PointType {
 class DtHdType {
 public:
     sal_uInt8  Reserved[256];
-    friend SvStream& operator>>(SvStream& rIStream, DtHdType& rDtHd);
+    friend SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd);
     friend void DtHdOverSeek(SvStream& rInp);
 };
 
@@ -66,7 +66,7 @@ public:
     sal_uInt8        LnAnzH;
     sal_uInt8        LnAnzV;
     UCHAR            PgName[32];  // page name
-    friend SvStream& operator>>(SvStream& rIStream, PageType& rPage);
+    friend SvStream& ReadPageType(SvStream& rIStream, PageType& rPage);
 };
 
 enum ObjArtType {ObjStrk,ObjRect,ObjPoly,ObjCirc,ObjSpln,
@@ -137,7 +137,7 @@ public:
     PointType      ObjMax;     // XY maximum of the object
     sal_uInt8      Art;
     sal_uInt8      Layer;
-    friend SvStream& operator>>(SvStream& rIStream, ObjkType& rObjk);
+    friend SvStream& ReadObjkType(SvStream& rIStream, ObjkType& rObjk);
     friend sal_Bool ObjOverSeek(SvStream& rInp, ObjkType& rObjk);
     virtual void Draw(OutputDevice& rOut);
 };
@@ -150,7 +150,7 @@ public:
     ObjLineType     L;
     PointType       Pos1;      // start point
     PointType       Pos2;      // end point
-    friend SvStream& operator>>(SvStream& rIStream, StrkType& rStrk);
+    friend SvStream& ReadStrkType(SvStream& rIStream, StrkType& rStrk);
     virtual void Draw(OutputDevice& rOut);
 };
 
@@ -166,7 +166,7 @@ public:
     sal_Int16       Radius;    // radius of corner
     sal_uInt16      DrehWink;  //  315...<45
     sal_uInt16      Slant;     // >270...<90
-    friend SvStream& operator>>(SvStream& rIStream, RectType& rRect);
+    friend SvStream& ReadRectType(SvStream& rIStream, RectType& rRect);
     virtual void Draw(OutputDevice& rOut);
 };
 
@@ -181,7 +181,7 @@ public:
     sal_uInt8        Reserve;
     sal_uInt32       SD_EckP; // pointer to corner point (StarDraw)
     PointType*       EckP;    // pointer to corner points (StarView (is not read from disk!))
-    friend SvStream& operator>>(SvStream& rIStream, PolyType& rPoly);
+    friend SvStream& ReadPolyType(SvStream& rIStream, PolyType& rPoly);
     virtual void Draw(OutputDevice& rOut);
 };
 #define  PolyClosBit 0x01     // kinds of Poly:   0: polyLine  1: polygon
@@ -197,7 +197,7 @@ public:
     sal_uInt8        Reserve;
     sal_uInt32       SD_EckP; // pointer to corner points (StarDraw)
     PointType*       EckP;    // pointer to corner points (StarView (is not read from disk!))
-    friend SvStream& operator>>(SvStream& rIStream, SplnType& rSpln);
+    friend SvStream& ReadSplnType(SvStream& rIStream, SplnType& rSpln);
     virtual void Draw(OutputDevice& rOut);
 };
 // kinds of Spline: see Poly
@@ -214,7 +214,7 @@ public:
     sal_uInt16      DrehWink;  // only ellipses
     sal_uInt16      StartWink; // and not for full circles
     sal_uInt16      RelWink;   // and full ellipses
-    friend SvStream& operator>>(SvStream& rIStream, CircType& rCirc);
+    friend SvStream& ReadCircType(SvStream& rIStream, CircType& rCirc);
     virtual void Draw(OutputDevice& rOut);
 };
 #define CircFull 0x00  /* kinds of circle: 0: full circle    */
@@ -239,7 +239,7 @@ public:
     PointType   FitSize;     // size of origin for Fit2Size
     sal_Int16   FitBreit;    // width to format for Fit2Size
     UCHAR*      Buffer;      // this variable is not set by reading from disk, but explicit!
-    friend SvStream& operator>>(SvStream& rIStream, TextType& rText);
+    friend SvStream& ReadTextType(SvStream& rIStream, TextType& rText);
     virtual void Draw(OutputDevice& rOut);
 };
 #define TextOutlBit 0x01     /*       1=Sourcecode for outliner (ignored byDrawObjekt()) */
@@ -269,7 +269,7 @@ public:
     sal_Bool    LightOut;     // brighten? (SD20)
     sal_uInt8   GrfFlg;       // (SD20) 0=nSGF 1=Pcx 2=HPGL 4=Raw $FF=Undef (to fix DrawBmp)
     INetURLObject aFltPath;   // for GraphicFilter
-    friend SvStream& operator>>(SvStream& rIStream, BmapType& rBmap);
+    friend SvStream& ReadBmapType(SvStream& rIStream, BmapType& rBmap);
     virtual void Draw(OutputDevice& rOut);
     void SetPaths( const INetURLObject rFltPath );
 };
@@ -284,7 +284,7 @@ public:
     sal_uInt16  ChartSize;     // required amount of memory for structure of diagram structure
     sal_uInt32  ChartPtr;      // diagram structure
     sal_uInt32  GetSubPtr();   // only to check if Sublist is empty
-    friend SvStream& operator>>(SvStream& rIStream, GrupType& rGrup);
+    friend SvStream& ReadGrupType(SvStream& rIStream, GrupType& rGrup);
 };
 
 void SetLine(ObjLineType& rLine, OutputDevice& rOut);
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 9db92458cb24..dcb0b8641280 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -460,8 +460,6 @@ struct XForm
         eM11 =  eM22 = 1.0f;
         eDx = eDy = eM12 = eM21 = 0.0f;
     }
-
-    friend SvStream& operator>>( SvStream& rIn, XForm& rXForm );
 };
 
 // -----------------------------------------------------------------------------
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 2c1d817519d2..dc228087dd07 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -738,7 +738,7 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation )
     return rOStm;
 }
 
-SvStream& operator>>( SvStream& rIStm, Animation& rAnimation )
+SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation )
 {
     Bitmap  aBmp;
     sal_uLong   nStmPos = rIStm.Tell();
@@ -782,9 +782,9 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation )
         do
         {
             ReadDIBBitmapEx(aAnimBmp.aBmpEx, rIStm);
-            rIStm >> aAnimBmp.aPosPix;
-            rIStm >> aAnimBmp.aSizePix;
-            rIStm >> rAnimation.maGlobalSize;
+            ReadPair( rIStm, aAnimBmp.aPosPix );
+            ReadPair( rIStm, aAnimBmp.aSizePix );
+            ReadPair( rIStm, rAnimation.maGlobalSize );
             rIStm >> nTmp16; aAnimBmp.nWait = ( ( 65535 == nTmp16 ) ? ANIMATION_TIMEOUT_ON_CLICK : nTmp16 );
             rIStm >> nTmp16; aAnimBmp.eDisposal = ( Disposal) nTmp16;
             rIStm >> cTmp; aAnimBmp.bUserInput = (sal_Bool) cTmp;
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index bad3016c6c19..75461611d20d 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -37,8 +37,8 @@ void ImplReadRect( SvStream& rIStm, Rectangle& rRect )
     Point aTL;
     Point aBR;
 
-    rIStm >> aTL;
-    rIStm >> aBR;
+    ReadPair( rIStm, aTL );
+    ReadPair( rIStm, aBR );
 
     rRect = Rectangle( aTL, aBR );
 }
@@ -57,7 +57,7 @@ void ImplReadPoly( SvStream& rIStm, Polygon& rPoly )
     rPoly = Polygon( (sal_uInt16) nSize );
 
     for( sal_uInt16 i = 0; i < (sal_uInt16) nSize; i++ )
-        rIStm >> rPoly[ i ];
+        ReadPair( rIStm, rPoly[ i ] );
 }
 
 void ImplReadPolyPoly( SvStream& rIStm, PolyPolygon& rPolyPoly )
@@ -135,7 +135,9 @@ void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode )
     sal_Int32   nYDenom;
     sal_Int16   nUnit;
 
-    rIStm >> nUnit >> aOrg >> nXNum >> nXDenom >> nYNum >> nYDenom;
+    rIStm >> nUnit;
+    ReadPair( rIStm, aOrg );
+    rIStm >> nXNum >> nXDenom >> nYNum >> nYDenom;
     rMapMode = MapMode( (MapUnit) nUnit, aOrg, Fraction( nXNum, nXDenom ), Fraction( nYNum, nYDenom ) );
 }
 
@@ -403,7 +405,7 @@ void ImplReadExtendedPolyPolygonAction(SvStream& rIStm, PolyPolygon& rPolyPoly)
         {
             for(sal_uInt16 b(0); b < nPointCount; b++)
             {
-                rIStm >> aCandidate[b];
+                ReadPair( rIStm , aCandidate[b] );
             }
 
             sal_uInt8 bHasFlags(false);
@@ -509,7 +511,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
             {
                 case( GDI_PIXEL_ACTION ):
                 {
-                    rIStm >> aPt;
+                    ReadPair( rIStm, aPt );
                     ImplReadColor( rIStm, aActionColor );
                     rMtf.AddAction( new MetaPixelAction( aPt, aActionColor ) );
                 }
@@ -517,14 +519,15 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                 case( GDI_POINT_ACTION ):
                 {
-                    rIStm >> aPt;
+                    ReadPair( rIStm, aPt );
                     rMtf.AddAction( new MetaPointAction( aPt ) );
                 }
                 break;
 
                 case( GDI_LINE_ACTION ):
                 {
-                    rIStm >> aPt >> aPt1;
+                    ReadPair( rIStm, aPt );
+                    ReadPair( rIStm, aPt1 );
                     rMtf.AddAction( new MetaLineAction( aPt, aPt1, aLineInfo ) );
                 }
                 break;
@@ -672,7 +675,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 case( GDI_ARC_ACTION ):
                 {
                     ImplReadRect( rIStm, aRect );
-                    rIStm >> aPt >> aPt1;
+                    ReadPair( rIStm, aPt );
+                    ReadPair( rIStm, aPt1 );
 
                     if( bFatLine )
                     {
@@ -692,7 +696,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 case( GDI_PIE_ACTION ):
                 {
                     ImplReadRect( rIStm, aRect );
-                    rIStm >> aPt >> aPt1;
+                    ReadPair( rIStm, aPt );
+                    ReadPair( rIStm, aPt1 );
 
                     if( bFatLine )
                     {
@@ -827,7 +832,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 {
                     sal_Int32       nIndex, nLen;
 
-                    rIStm >> aPt >> nIndex >> nLen >> nTmp;
+                    ReadPair( rIStm, aPt ) >> nIndex >> nLen >> nTmp;
                     if (nTmp > 0)
                     {
                         OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp);
@@ -849,7 +854,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     sal_Int32*  pDXAry = NULL;
                     sal_Int32   nIndex, nLen, nAryLen;
 
-                    rIStm >> aPt >> nIndex >> nLen >> nTmp >> nAryLen;
+                    ReadPair( rIStm, aPt ) >> nIndex >> nLen >> nTmp >> nAryLen;
                     if (nTmp > 0)
                     {
                         OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp);
@@ -911,7 +916,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 {
                     sal_Int32       nIndex, nLen, nWidth;
 
-                    rIStm >> aPt >> nIndex >> nLen >> nTmp >> nWidth;
+                    ReadPair( rIStm, aPt ) >> nIndex >> nLen >> nTmp >> nWidth;
                     if (nTmp > 0)
                     {
                         OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp);
@@ -932,7 +937,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 {
                     Bitmap aBmp;
 
-                    rIStm >> aPt;
+                    ReadPair( rIStm, aPt );
                     ReadDIB(aBmp, rIStm, true);
                     rMtf.AddAction( new MetaBmpAction( aPt, aBmp ) );
                 }
@@ -942,7 +947,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 {
                     Bitmap aBmp;
 
-                    rIStm >> aPt >> aSz;
+                    ReadPair( rIStm, aPt );
+                    ReadPair( rIStm, aSz );
                     ReadDIB(aBmp, rIStm, true);
                     rMtf.AddAction( new MetaBmpScaleAction( aPt, aSz, aBmp ) );
                 }
@@ -953,7 +959,10 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     Bitmap  aBmp;
                     Size    aSz2;
 
-                    rIStm >> aPt >> aSz >> aPt1 >> aSz2;
+                    ReadPair( rIStm, aPt );
+                    ReadPair( rIStm, aSz );
+                    ReadPair( rIStm, aPt1 );
+                    ReadPair( rIStm, aSz2 );
                     ReadDIB(aBmp, rIStm, true);
                     rMtf.AddAction( new MetaBmpScalePartAction( aPt, aSz, aPt1, aSz2, aBmp ) );
                 }
@@ -1170,7 +1179,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     sal_Int32       nFollowingActionCount;
                     sal_Int16       nTrans;
 
-                    rIStm >> aPolyPoly >> nTrans >> nFollowingActionCount;
+                    ReadPolyPolygon( rIStm, aPolyPoly );
+                    rIStm >> nTrans >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
                     rMtf.AddAction( new MetaTransparentAction( aPolyPoly, nTrans ) );
 
@@ -1186,7 +1196,11 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     Gradient    aGradient;
                     sal_Int32       nFollowingActionCount;
 
-                    rIStm >> aMtf >> aPos >> aSize >> aGradient >> nFollowingActionCount;
+                    ReadGDIMetaFile( rIStm, aMtf );
+                    ReadPair( rIStm, aPos );
+                    ReadPair( rIStm, aSize );
+                    ReadGradient( rIStm, aGradient );
+                    rIStm >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
                     rMtf.AddAction( new MetaFloatTransparentAction( aMtf, aPos, aSize, aGradient ) );
 
@@ -1200,7 +1214,9 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     Hatch       aHatch;
                     sal_Int32       nFollowingActionCount;
 
-                    rIStm >> aPolyPoly >> aHatch >> nFollowingActionCount;
+                    ReadPolyPolygon( rIStm, aPolyPoly );
+                    ReadHatch( rIStm, aHatch );
+                    rIStm >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
                     rMtf.AddAction( new MetaHatchAction( aPolyPoly, aHatch ) );
 
@@ -1214,7 +1230,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     sal_Bool    bSet;
                     sal_Int32   nFollowingActionCount;
 
-                    rIStm >> aRefPoint >> bSet >> nFollowingActionCount;
+                    ReadPair( rIStm, aRefPoint );
+                    rIStm >> bSet >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
                     rMtf.AddAction( new MetaRefPointAction( aRefPoint, bSet ) );
 
@@ -1234,7 +1251,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     sal_Bool    bSet;
                     sal_Int32   nFollowingActionCount;
 
-                    rIStm >> aColor >> bSet >> nFollowingActionCount;
+                    ReadColor( rIStm, aColor );
+                    rIStm >> bSet >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
                     rMtf.AddAction( new MetaTextLineColorAction( aColor, bSet ) );
 
@@ -1251,7 +1269,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     sal_uInt32 nUnderline;
                     sal_Int32   nFollowingActionCount;
 
-                    rIStm >> aStartPt >> nWidth >> nStrikeout >> nUnderline >> nFollowingActionCount;
+                    ReadPair( rIStm, aStartPt );
+                    rIStm >> nWidth >> nStrikeout >> nUnderline >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
                     rMtf.AddAction( new MetaTextLineAction( aStartPt, nWidth,
                                                             (FontStrikeout) nStrikeout,
@@ -1268,7 +1287,9 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     Gradient    aGradient;
                     sal_Int32       nFollowingActionCount;
 
-                    rIStm >> aPolyPoly >> aGradient >> nFollowingActionCount;
+                    ReadPolyPolygon( rIStm, aPolyPoly );
+                    ReadGradient( rIStm, aGradient );
+                    rIStm >> nFollowingActionCount;
                     ImplSkipActions( rIStm, nFollowingActionCount );
                     rMtf.AddAction( new MetaGradientExAction( aPolyPoly, aGradient ) );
 
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 389f17ec198d..9de7205622be 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1491,7 +1491,7 @@ bool ReadDIBBitmapEx(
                 {
                     Color aTransparentColor;
 
-                    rIStm >> aTransparentColor;
+                    ReadColor( rIStm, aTransparentColor );
                     bRetval = !rIStm.GetError();
 
                     if(bRetval)
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 2da441818035..fb2c49bafa9d 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -655,7 +655,7 @@ void Font::GetFontAttributes( ImplFontAttributes& rAttrs ) const
     rAttrs.SetSymbolFlag( mpImplFont->meCharSet == RTL_TEXTENCODING_SYMBOL );
 }
 
-SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font )
+SvStream& ReadImpl_Font( SvStream& rIStm, Impl_Font& rImpl_Font )
 {
     VersionCompat   aCompat( rIStm, STREAM_READ );
     sal_uInt16          nTmp16;
@@ -664,7 +664,7 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font )
 
     rImpl_Font.maFamilyName = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet());
     rImpl_Font.maStyleName = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet());
-    rIStm >> rImpl_Font.maSize;
+    ReadPair( rIStm, rImpl_Font.maSize );
 
     rIStm >> nTmp16; rImpl_Font.meCharSet = (rtl_TextEncoding) nTmp16;
     rIStm >> nTmp16; rImpl_Font.meFamily = (FontFamily) nTmp16;
@@ -736,10 +736,10 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font )
     return rOStm;
 }
 
-SvStream& operator>>( SvStream& rIStm, Font& rFont )
+SvStream& ReadFont( SvStream& rIStm, Font& rFont )
 {
     rFont.MakeUnique();
-    return( rIStm >> *rFont.mpImplFont );
+    return ReadImpl_Font( rIStm, *rFont.mpImplFont );
 }
 
 SvStream& WriteFont( SvStream& rOStm, const Font& rFont )
diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx
index 6d3e213be91d..45623853bfda 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -880,7 +880,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource)
 
                         {   // read SvtGraphicFill
                             SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),STREAM_READ);
-                            aMemStm >> aFilling;
+                            ReadSvtGraphicFill( aMemStm, aFilling );
                         }
 
                         aFilling.getPath(aPath);
@@ -921,7 +921,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource)
 
                         {   // read SvtGraphicFill
                             SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),STREAM_READ);
-                            aMemStm >> aStroke;
+                            ReadSvtGraphicStroke( aMemStm, aStroke );
                         }
 
                         aStroke.getPath(aPath);
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index cdef014221c7..d11fbbbbd9ee 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1197,7 +1197,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
                                 if ( bPathStroke )
                                 {
                                     SvtGraphicStroke aStroke;
-                                    aMemStm >> aStroke;
+                                    ReadSvtGraphicStroke( aMemStm, aStroke );
                                     Polygon aPath;
                                     aStroke.getPath( aPath );
                                     aStroke.setPath( ImplGetRotatedPolygon( aPath, aRotAnchor, aRotOffset, fSin, fCos ) );
@@ -1208,7 +1208,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
                                 else
                                 {
                                     SvtGraphicFill aFill;
-                                    aMemStm >> aFill;
+                                    ReadSvtGraphicFill( aMemStm, aFill );
                                     PolyPolygon aPath;
                                     aFill.getPath( aPath );
                                     aFill.setPath( ImplGetRotatedPolyPolygon( aPath, aRotAnchor, aRotOffset, fSin, fCos ) );
@@ -2726,7 +2726,7 @@ sal_uLong GDIMetaFile::GetSizeBytes() const
     return( nSizeBytes );
 }
 
-SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
+SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
 {
     if( !rIStm.GetError() )
     {
@@ -2751,8 +2751,8 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
             pCompat = new VersionCompat( rIStm, STREAM_READ );
 
             rIStm >> nStmCompressMode;
-            rIStm >> rGDIMetaFile.aPrefMapMode;
-            rIStm >> rGDIMetaFile.aPrefSize;
+            ReadMapMode( rIStm, rGDIMetaFile.aPrefMapMode );
+            ReadPair( rIStm, rGDIMetaFile.aPrefSize );
             rIStm >> nCount;
 
             delete pCompat;
@@ -2830,7 +2830,7 @@ Please set environment variable SAL_ENABLE_SVM1 to '1' to reenable old behavior"
 SvStream& GDIMetaFile::Read( SvStream& rIStm )
 {
     Clear();
-    rIStm >> *this;
+    ReadGDIMetaFile( rIStm, *this );
 
     return rIStm;
 }
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index de5daf3444d2..51f9cc344d01 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -293,7 +293,7 @@ SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink )
     return rOStream;
 }
 
-SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink)
+SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink)
 {
     Size            aSize;
     MapMode         aMapMode;
@@ -309,7 +309,8 @@ SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink)
 
     if( pCompat->GetVersion() >= 2 )
     {
-        rIStream >> aSize >> aMapMode;
+        ReadPair( rIStream, aSize );
+        ReadMapMode( rIStream, aMapMode );
         bMapAndSizeValid = true;
     }
 
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 89d3ec182b62..73ca288f8ddf 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -286,16 +286,16 @@ sal_Bool Gradient::operator==( const Gradient& rGradient ) const
         return sal_False;
 }
 
-SvStream& operator>>( SvStream& rIStm, Impl_Gradient& rImpl_Gradient )
+SvStream& ReadImpl_Gradient( SvStream& rIStm, Impl_Gradient& rImpl_Gradient )
 {
     VersionCompat   aCompat( rIStm, STREAM_READ );
     sal_uInt16          nTmp16;
 
     rIStm >> nTmp16; rImpl_Gradient.meStyle = (GradientStyle) nTmp16;
 
-    rIStm >> rImpl_Gradient.maStartColor >>
-             rImpl_Gradient.maEndColor >>
-             rImpl_Gradient.mnAngle >>
+    ReadColor( rIStm, rImpl_Gradient.maStartColor );
+    ReadColor( rIStm, rImpl_Gradient.maEndColor );
+    rIStm >> rImpl_Gradient.mnAngle >>
              rImpl_Gradient.mnBorder >>
              rImpl_Gradient.mnOfsX >>
              rImpl_Gradient.mnOfsY >>
@@ -324,10 +324,10 @@ SvStream& WriteImpl_Gradient( SvStream& rOStm, const Impl_Gradient& rImpl_Gradie
     return rOStm;
 }
 
-SvStream& operator>>( SvStream& rIStm, Gradient& rGradient )
+SvStream& ReadGradient( SvStream& rIStm, Gradient& rGradient )
 {
     rGradient.MakeUnique();
-    return( rIStm >> *rGradient.mpImplGradient );
+    return ReadImpl_Gradient( rIStm, *rGradient.mpImplGradient );
 }
 
 SvStream& WriteGradient( SvStream& rOStm, const Gradient& rGradient )
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index afa17a3aff5f..20b1b090464c 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -306,7 +306,7 @@ sal_Bool Graphic::operator!() const
 
 void Graphic::Load( SvStream& rIStm )
 {
-    rIStm >> *this;
+    ReadGraphic( rIStm, *this );
 }
 
 void Graphic::Save( SvStream& rOStm )
@@ -571,10 +571,10 @@ sal_Bool Graphic::ExportNative( SvStream& rOStream ) const
     return mpImpGraphic->ImplExportNative( rOStream );
 }
 
-SvStream& operator>>( SvStream& rIStream, Graphic& rGraphic )
+SvStream& ReadGraphic( SvStream& rIStream, Graphic& rGraphic )
 {
     rGraphic.ImplTestRefCount();
-    return rIStream >> *rGraphic.mpImpGraphic;
+    return ReadImpGraphic( rIStream, *rGraphic.mpImpGraphic );
 }
 
 SvStream& WriteGraphic( SvStream& rOStream, const Graphic& rGraphic )
diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx
index 31d9d61d23a7..b2a6eda87cfd 100644
--- a/vcl/source/gdi/graphictools.cxx
+++ b/vcl/source/gdi/graphictools.cxx
@@ -158,7 +158,7 @@ SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass
     return rOStm;
 }
 
-SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass )
+SvStream& ReadSvtGraphicStroke( SvStream& rIStm, SvtGraphicStroke& rClass )
 {
     VersionCompat aCompat( rIStm, STREAM_READ );
 
@@ -316,12 +316,12 @@ SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass )
     return rOStm;
 }
 
-SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass )
+SvStream& ReadSvtGraphicFill( SvStream& rIStm, SvtGraphicFill& rClass )
 {
     VersionCompat aCompat( rIStm, STREAM_READ );
 
     rClass.maPath.Read( rIStm );
-    rIStm >> rClass.maFillColor;
+    ReadColor( rIStm, rClass.maFillColor );
     rIStm >> rClass.mfTransparency;
     sal_uInt16 nTmp;
     rIStm >> nTmp;
@@ -335,13 +335,13 @@ SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass )
     rClass.mbTiling = nTmp;
     rIStm >> nTmp;
     rClass.maHatchType = SvtGraphicFill::HatchType( nTmp );
-    rIStm >> rClass.maHatchColor;
+    ReadColor( rIStm, rClass.maHatchColor );
     rIStm >> nTmp;
     rClass.maGradientType = SvtGraphicFill::GradientType( nTmp );
-    rIStm >> rClass.maGradient1stColor;
-    rIStm >> rClass.maGradient2ndColor;
+    ReadColor( rIStm, rClass.maGradient1stColor );
+    ReadColor( rIStm, rClass.maGradient2ndColor );
     rIStm >> rClass.maGradientStepCount;
-    rIStm >> rClass.maFillGraphic;
+    ReadGraphic( rIStm, rClass.maFillGraphic );
 
     return rIStm;
 }
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index b55b22abed2a..8ad2368da8f0 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.cxx
@@ -119,7 +119,7 @@ void Hatch::SetAngle( sal_uInt16 nAngle10 )
     mpImplHatch->mnAngle = nAngle10;
 }
 
-SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch )
+SvStream& ReadImplHatch( SvStream& rIStm, ImplHatch& rImplHatch )
 {
     VersionCompat   aCompat( rIStm, STREAM_READ );
     sal_uInt16          nTmp16;
@@ -127,7 +127,7 @@ SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch )
 
     rIStm >> nTmp16; rImplHatch.meStyle = (HatchStyle) nTmp16;
     //#fdo39428 SvStream no longer supports operator>>(long&)
-    rIStm >> rImplHatch.maColor >> nTmp32 >> rImplHatch.mnAngle;
+    ReadColor( rIStm, rImplHatch.maColor ) >> nTmp32 >> rImplHatch.mnAngle;
     rImplHatch.mnDistance = nTmp32;
 
     return rIStm;
@@ -145,10 +145,10 @@ SvStream& WriteImplHatch( SvStream& rOStm, const ImplHatch& rImplHatch )
     return rOStm;
 }
 
-SvStream& operator>>( SvStream& rIStm, Hatch& rHatch )
+SvStream& ReadHatch( SvStream& rIStm, Hatch& rHatch )
 {
     rHatch.ImplMakeUnique();
-    return( rIStm >> *rHatch.mpImplHatch );
+    return ReadImplHatch( rIStm, *rHatch.mpImplHatch );
 }
 
 SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch )
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 5fe15726bdd8..b1b04606e497 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1015,8 +1015,8 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap )
 
         rIStm >> nType;
         rIStm >> nLen;
-        rIStm >> aSize;
-        rIStm >> aMapMode;
+        ReadPair( rIStm, aSize );
+        ReadMapMode( rIStm, aMapMode );
 
         delete pCompat;
     }
@@ -1173,7 +1173,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap )
         }
         else if( meType == GRAPHIC_BITMAP || meType == GRAPHIC_GDIMETAFILE )
         {
-            rIStm >> *this;
+            ReadImpGraphic( rIStm, *this );
             bRet = ( rIStm.GetError() == 0UL );
         }
         else if( sal::static_int_cast<sal_uLong>(meType) >= SYS_WINMETAFILE
@@ -1587,7 +1587,7 @@ const SvgDataPtr& ImpGraphic::getSvgData() const
     return maSvgData;
 }
 
-SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
+SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
 {
     if( !rIStm.GetError() )
     {
@@ -1616,7 +1616,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
                 pCompat = new VersionCompat( rIStm, STREAM_READ );
                 delete pCompat;
 
-                rIStm >> aLink;
+                ReadGfxLink( rIStm, aLink );
 
                 // set dummy link to avoid creation of additional link after filtering;
                 // we set a default link to avoid unnecessary swapping of native data
@@ -1668,7 +1668,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
                     {
                         delete rImpGraphic.mpAnimation;
                         rImpGraphic.mpAnimation = new Animation;
-                        rIStm >> *rImpGraphic.mpAnimation;
+                        ReadAnimation( rIStm, *rImpGraphic.mpAnimation );
 
                         // #108077# manually set loaded BmpEx to Animation
                         // (which skips loading its BmpEx if already done)
@@ -1683,7 +1683,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
 
                     rIStm.Seek( nStmPos1 );
                     rIStm.ResetError();
-                    rIStm >> aMtf;
+                    ReadGDIMetaFile( rIStm, aMtf );
 
                     if( !rIStm.GetError() )
                     {
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index b0204af4cc39..35133b88ca30 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -221,7 +221,7 @@ sal_Bool JobSetup::operator==( const JobSetup& rJobSetup ) const
     return sal_False;
 }
 
-SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
+SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )
 {
     DBG_ASSERTWARNING( rIStream.GetVersion(), "JobSetup::>> - Solar-Version not set on rOStream" );
 
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx
index 0151836257ba..c733808b2ca5 100644
--- a/vcl/source/gdi/lineinfo.cxx
+++ b/vcl/source/gdi/lineinfo.cxx
@@ -229,7 +229,7 @@ sal_Bool LineInfo::IsDefault() const
 
 // -----------------------------------------------------------------------
 
-SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo )
+SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo )
 {
     VersionCompat   aCompat( rIStm, STREAM_READ );
     sal_uInt16          nTmp16(0);
@@ -292,10 +292,10 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo
 
 // -----------------------------------------------------------------------
 
-SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo )
+SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo )
 {
     rLineInfo.ImplMakeUnique();
-    return( rIStm >> *rLineInfo.mpImplLineInfo );
+    return ReadImplLineInfo( rIStm, *rLineInfo.mpImplLineInfo );
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index d4286d57361d..56d8380e589a 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -43,14 +43,16 @@ ImplMapMode::ImplMapMode( const ImplMapMode& rImplMapMode ) :
     mbSimple        = sal_False;
 }
 
-SvStream& operator>>( SvStream& rIStm, ImplMapMode& rImplMapMode )
+SvStream& ReadImplMapMode( SvStream& rIStm, ImplMapMode& rImplMapMode )
 {
     VersionCompat   aCompat( rIStm, STREAM_READ );
     sal_uInt16          nTmp16;
 
     rIStm >> nTmp16; rImplMapMode.meUnit = (MapUnit) nTmp16;
-    rIStm >> rImplMapMode.maOrigin >> rImplMapMode.maScaleX >>
-             rImplMapMode.maScaleY >> rImplMapMode.mbSimple;
+    ReadPair( rIStm, rImplMapMode.maOrigin );
+    ReadFraction( rIStm, rImplMapMode.maScaleX );
+    ReadFraction( rIStm, rImplMapMode.maScaleY );
+    rIStm >> rImplMapMode.mbSimple;
 
     return rIStm;
 }
@@ -231,10 +233,10 @@ sal_Bool MapMode::IsDefault() const
         return sal_False;
 }
 
-SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode )
+SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode )
 {
     rMapMode.ImplMakeUnique();
-    return (rIStm >> *rMapMode.mpImplMapMode);
+    return ReadImplMapMode( rIStm, *rMapMode.mpImplMapMode );
 }
 
 SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode )
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 307e81088fd0..30fcd3909153 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -298,7 +298,7 @@ void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maPt;
+    ReadPair( rIStm, maPt );
     maColor.Read( rIStm, true );
 }
 
@@ -364,7 +364,7 @@ void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maPt;
+    ReadPair( rIStm, maPt );
 }
 
 // ========================================================================
@@ -454,12 +454,13 @@ void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
     COMPAT( rIStm );
 
     // Version 1
-    rIStm >> maStartPt >> maEndPt;
+    ReadPair( rIStm, maStartPt );
+    ReadPair( rIStm, maEndPt );
 
     // Version 2
     if( aCompat.GetVersion() >= 2 )
     {
-        rIStm >> maLineInfo;
+        ReadLineInfo( rIStm, maLineInfo );
     }
 }
 
@@ -525,7 +526,7 @@ void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRect;
+    ReadRectangle( rIStm, maRect );
 }
 
 // ========================================================================
@@ -598,7 +599,7 @@ void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRect >> mnHorzRound >> mnVertRound;
+    ReadRectangle( rIStm, maRect ) >> mnHorzRound >> mnVertRound;
 }
 
 // ========================================================================
@@ -663,7 +664,7 @@ void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRect;
+    ReadRectangle( rIStm, maRect );
 }
 
 // ========================================================================
@@ -739,7 +740,9 @@ void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRect >> maStartPt >> maEndPt;
+    ReadRectangle( rIStm, maRect );
+    ReadPair( rIStm, maStartPt );
+    ReadPair( rIStm, maEndPt );
 }
 
 // ========================================================================
@@ -815,7 +818,9 @@ void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRect >> maStartPt >> maEndPt;
+    ReadRectangle( rIStm, maRect );
+    ReadPair( rIStm, maStartPt );
+    ReadPair( rIStm, maEndPt );
 }
 
 // ========================================================================
@@ -891,7 +896,9 @@ void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRect >> maStartPt >> maEndPt;
+    ReadRectangle( rIStm, maRect );
+    ReadPair( rIStm, maStartPt );
+    ReadPair( rIStm, maEndPt );
 }
 
 // ========================================================================
@@ -987,11 +994,11 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
     COMPAT( rIStm );
 
     // Version 1
-    rIStm >> maPoly;
+    ReadPolygon( rIStm, maPoly );
 
     // Version 2
     if( aCompat.GetVersion() >= 2 )
-        rIStm >> maLineInfo;
+        ReadLineInfo( rIStm, maLineInfo );
     if ( aCompat.GetVersion() >= 3 )
     {
         sal_uInt8 bHasPolyFlags;
@@ -1072,7 +1079,7 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
 
-    rIStm >> maPoly;                    // Version 1
+    ReadPolygon( rIStm, maPoly );                    // Version 1
 
     if( aCompat.GetVersion() >= 2 )     // Version 2
     {
@@ -1172,7 +1179,7 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maPolyPoly;                // Version 1
+    ReadPolyPolygon( rIStm, maPolyPoly );                // Version 1
 
     if ( aCompat.GetVersion() >= 2 )    // Version 2
     {
@@ -1262,7 +1269,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
     COMPAT( rIStm );
-    rIStm   >> maPt;
+    ReadPair( rIStm, maPt );
     maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
     rIStm   >> mnIndex;
     rIStm   >> mnLen;
@@ -1407,7 +1414,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
     delete[] mpDXAry;
 
     COMPAT( rIStm );
-    rIStm   >> maStartPt;
+    ReadPair( rIStm, maStartPt );
     maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
     rIStm   >> mnIndex;
     rIStm   >> mnLen;
@@ -1537,7 +1544,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
     COMPAT( rIStm );
-    rIStm   >> maPt;
+    ReadPair( rIStm, maPt );
     maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
     rIStm   >> mnWidth;
     rIStm   >> mnIndex;
@@ -1618,7 +1625,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
     COMPAT( rIStm );
-    rIStm   >> maRect;
+    ReadRectangle( rIStm, maRect );
     maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
     rIStm   >> mnStyle;
 
@@ -1711,7 +1718,7 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
     //#fdo39428 SvStream no longer supports operator>>(long&)
     sal_uInt32 nTemp;
     sal_Int32 nTemp2;
-    rIStm >> maPos;
+    ReadPair( rIStm, maPos );
     rIStm >> nTemp2;
     mnWidth = nTemp2;
     rIStm >> nTemp;
@@ -1793,7 +1800,7 @@ void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
     ReadDIB(maBmp, rIStm, true);
-    rIStm >> maPt;
+    ReadPair( rIStm, maPt );
 }
 
 // ========================================================================
@@ -1872,7 +1879,8 @@ void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
     ReadDIB(maBmp, rIStm, true);
-    rIStm >> maPt >> maSz;
+    ReadPair( rIStm, maPt );
+    ReadPair( rIStm, maSz );
 }
 
 // ========================================================================
@@ -1958,7 +1966,10 @@ void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
     ReadDIB(maBmp, rIStm, true);
-    rIStm >> maDstPt >> maDstSz >> maSrcPt >> maSrcSz;
+    ReadPair( rIStm, maDstPt );
+    ReadPair( rIStm, maDstSz );
+    ReadPair( rIStm, maSrcPt );
+    ReadPair( rIStm, maSrcSz );
 }
 
 // ========================================================================
@@ -2030,7 +2041,7 @@ void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
     ReadDIBBitmapEx(maBmpEx, rIStm);
-    rIStm >> maPt;
+    ReadPair( rIStm, maPt );
 }
 
 // ========================================================================
@@ -2109,7 +2120,8 @@ void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
     ReadDIBBitmapEx(maBmpEx, rIStm);
-    rIStm >> maPt >> maSz;
+    ReadPair( rIStm, maPt );
+    ReadPair( rIStm, maSz );
 }
 
 // ========================================================================
@@ -2195,7 +2207,10 @@ void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
     ReadDIBBitmapEx(maBmpEx, rIStm);
-    rIStm >> maDstPt >> maDstSz >> maSrcPt >> maSrcSz;
+    ReadPair( rIStm, maDstPt );
+    ReadPair( rIStm, maDstSz );
+    ReadPair( rIStm, maSrcPt );
+    ReadPair( rIStm, maSrcSz );
 }
 
 // ========================================================================
@@ -2271,7 +2286,7 @@ void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
     ReadDIB(maBmp, rIStm, true);
-    rIStm >> maPt;
+    ReadPair( rIStm, maPt );
 }
 
 // ========================================================================
@@ -2353,7 +2368,8 @@ void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
     ReadDIB(maBmp, rIStm, true);
-    rIStm >> maPt >> maSz;
+    ReadPair( rIStm, maPt );
+    ReadPair( rIStm, maSz );
 }
 
 // ========================================================================
@@ -2444,7 +2460,10 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
     COMPAT( rIStm );
     ReadDIB(maBmp, rIStm, true);
     maColor.Read( rIStm, true );
-    rIStm >> maDstPt >> maDstSz >> maSrcPt >> maSrcSz;
+    ReadPair( rIStm, maDstPt );
+    ReadPair( rIStm, maDstSz );
+    ReadPair( rIStm, maSrcPt );
+    ReadPair( rIStm, maSrcSz );
 }
 
 // ========================================================================
@@ -2512,7 +2531,8 @@ void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRect >> maGradient;
+    ReadRectangle( rIStm, maRect );
+    ReadGradient( rIStm, maGradient );
 }
 
 // ========================================================================
@@ -2599,7 +2619,8 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maPolyPoly >> maGradient;
+    ReadPolyPolygon( rIStm, maPolyPoly );
+    ReadGradient( rIStm, maGradient );
 }
 
 // ========================================================================
@@ -2673,7 +2694,8 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maPolyPoly >> maHatch;
+    ReadPolyPolygon( rIStm, maPolyPoly );
+    ReadHatch( rIStm, maHatch );
 }
 
 // ========================================================================
@@ -2741,7 +2763,7 @@ void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maWallpaper;
+    ReadWallpaper( rIStm, maWallpaper );
 }
 
 // ========================================================================
@@ -2812,7 +2834,8 @@ void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRegion >> mbClip;
+    ReadRegion( rIStm, maRegion );
+    rIStm >> mbClip;
 }
 
 // ========================================================================
@@ -2877,7 +2900,7 @@ void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* p
 void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRect;
+    ReadRectangle( rIStm, maRect );
 }
 
 // ========================================================================
@@ -2942,7 +2965,7 @@ void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData*
 void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRegion;
+    ReadRegion( rIStm, maRegion );
 }
 
 // ========================================================================
@@ -3463,7 +3486,7 @@ void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maMapMode;
+    ReadMapMode( rIStm, maMapMode );
 }
 
 // ========================================================================
@@ -3536,7 +3559,7 @@ void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
     COMPAT( rIStm );
-    rIStm >> maFont;
+    ReadFont( rIStm, maFont );
     pData->meActualCharSet = maFont.GetCharSet();
     if ( pData->meActualCharSet == RTL_TEXTENCODING_DONTKNOW )
         pData->meActualCharSet = osl_getThreadTextEncoding();
@@ -3759,7 +3782,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maPolyPoly;
+    ReadPolyPolygon( rIStm, maPolyPoly );
     rIStm >> mnTransPercent;
 }
 
@@ -3839,7 +3862,10 @@ void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pDat
 void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maMtf >> maPoint >> maSize >> maGradient;
+    ReadGDIMetaFile( rIStm, maMtf );
+    ReadPair( rIStm, maPoint );
+    ReadPair( rIStm, maSize );
+    ReadGradient( rIStm, maGradient );
 }
 
 // ========================================================================
@@ -3917,10 +3943,10 @@ void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maGfxLink;
-    rIStm >> maPoint;
-    rIStm >> maSize;
-    rIStm >> maSubst;
+    ReadGfxLink( rIStm, maGfxLink );
+    ReadPair( rIStm, maPoint );
+    ReadPair( rIStm, maSize );
+    ReadGDIMetaFile( rIStm, maSubst );
 }
 
 // ========================================================================
@@ -3977,7 +4003,7 @@ void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    rIStm >> maRefPoint >> mbSet;
+    ReadPair( rIStm, maRefPoint ) >> mbSet;
 }
 
 // ========================================================================
@@ -4067,7 +4093,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
                 if ( bPathStroke )
                 {
                     SvtGraphicStroke aStroke;
-                    aMemStm >> aStroke;
+                    ReadSvtGraphicStroke( aMemStm, aStroke );
 
                     Polygon aPath;
                     aStroke.getPath( aPath );
@@ -4089,7 +4115,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
                 else
                 {
                     SvtGraphicFill aFill;
-                    aMemStm >> aFill;
+                    ReadSvtGraphicFill( aMemStm, aFill );
 
                     PolyPolygon aPath;
                     aFill.getPath( aPath );
@@ -4124,14 +4150,14 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
                 if ( bPathStroke )
                 {
                     SvtGraphicStroke aStroke;
-                    aMemStm >> aStroke;
+                    ReadSvtGraphicStroke( aMemStm, aStroke );
                     aStroke.scale( fXScale, fYScale );
                     WriteSvtGraphicStroke( aDest, aStroke );
                 }
                 else
                 {
                     SvtGraphicFill aFill;
-                    aMemStm >> aFill;
+                    ReadSvtGraphicFill( aMemStm, aFill );
                     PolyPolygon aPath;
                     aFill.getPath( aPath );
                     aPath.Scale( fXScale, fYScale );
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index b04565905a47..135d5b0a43a2 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -563,7 +563,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
                             {
                                 sSeqEnd = OString("XPATHSTROKE_SEQ_END");
                                 SvtGraphicStroke aStroke;
-                                aMemStm >> aStroke;
+                                ReadSvtGraphicStroke( aMemStm, aStroke );
 
                                 Polygon aPath;
                                 aStroke.getPath( aPath );
@@ -648,7 +648,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
                             {
                                 sSeqEnd = OString("XPATHFILL_SEQ_END");
                                 SvtGraphicFill aFill;
-                                aMemStm >> aFill;
+                                ReadSvtGraphicFill( aMemStm, aFill );
 
                                 if ( ( aFill.getFillType() == SvtGraphicFill::fillSolid ) && ( aFill.getFillRule() == SvtGraphicFill::fillEvenOdd ) )
                                 {
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 5fd03256fa84..a77bdce9ec51 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -264,7 +264,7 @@ SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo )
 }
 
 
-SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo )
+SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo )
 {
     VersionCompat aCompat( rIStream, STREAM_READ );
 
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index b2ad73285b05..5432c9b79267 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -1558,7 +1558,7 @@ bool Region::operator==( const Region& rRegion ) const
     return false;
 }
 
-SvStream& operator>>(SvStream& rIStrm, Region& rRegion)
+SvStream& ReadRegion(SvStream& rIStrm, Region& rRegion)
 {
     VersionCompat aCompat(rIStrm, STREAM_READ);
     sal_uInt16 nVersion(0);
@@ -1605,7 +1605,7 @@ SvStream& operator>>(SvStream& rIStrm, Region& rRegion)
                 if(bHasPolyPolygon)
                 {
                     PolyPolygon* pNewPoly = new PolyPolygon();
-                    rIStrm >> *pNewPoly;
+                    ReadPolyPolygon( rIStrm, *pNewPoly );
                     rRegion.mpPolyPolygon.reset(pNewPoly);
                 }
             }
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 3b7bbab66562..a303d25ca508 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -97,7 +97,7 @@ void ImplWallpaper::ImplReleaseCachedBitmap()
 
 // -----------------------------------------------------------------------
 
-SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
+SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
 {
     VersionCompat   aCompat( rIStm, STREAM_READ );
     sal_uInt16          nTmp16;
@@ -112,7 +112,7 @@ SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
     rImplWallpaper.mpBitmap = NULL;
 
     // version 1
-    rIStm >> rImplWallpaper.maColor;
+    ReadColor( rIStm, rImplWallpaper.maColor );
     rIStm >> nTmp16; rImplWallpaper.meStyle = (WallpaperStyle) nTmp16;
 
     // version 2
@@ -125,13 +125,13 @@ SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
         if( bRect )
         {
             rImplWallpaper.mpRect = new Rectangle;
-            rIStm >> *rImplWallpaper.mpRect;
+            ReadRectangle( rIStm, *rImplWallpaper.mpRect );
         }
 
         if( bGrad )
         {
             rImplWallpaper.mpGradient = new Gradient;
-            rIStm >> *rImplWallpaper.mpGradient;
+            ReadGradient( rIStm, *rImplWallpaper.mpGradient );
         }
 
         if( bBmp )
@@ -549,10 +549,10 @@ sal_Bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper )
+SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper )
 {
     rWallpaper.ImplMakeUnique();
-    return( rIStm >> *rWallpaper.mpImplWallpaper );
+    return ReadImplWallpaper( rIStm, *rWallpaper.mpImplWallpaper );
 }
 
 // -----------------------------------------------------------------------