convert SvStream::operator<< overloads to more explicit methods

This is in preparation for more conversion of SvStream::operator<< calls
to use more explicit method names.
This converts the subclasses that have their own convenience overloads
of operator<< to use normal methods.

Change-Id: I5efd5d9a24c264cb86d2471303dd5849bf91ba80

25 files changed, 214 insertions, 184 deletions

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index b464ee56ed30..0a9266013f99 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -83,7 +83,7 @@ private:
                         mbTransparent:1;    // compatibility, now on output device
 
     friend SvStream&    operator>>( SvStream& rIStm, Impl_Font& );
-    friend SvStream&    operator<<( SvStream& rOStm, const Impl_Font& );
+    friend SvStream&    WriteImpl_Font( SvStream& rOStm, const Impl_Font& );
 };
 
 // ------------------
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 8ccabf6711f0..76cacb7f8f47 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -160,7 +160,7 @@ private:
 
     sal_Bool                ImplExportNative( SvStream& rOStm ) const;
 
-    friend SvStream&    operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic );
+    friend SvStream&    WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic );
     friend SvStream&    operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic );
 
     // SvgData support
diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx
index f47c8f663cea..c6329b6abbe4 100644
--- a/vcl/inc/wall2.hxx
+++ b/vcl/inc/wall2.hxx
@@ -36,7 +36,7 @@ private:
     BitmapEx*       mpCache;
 
     friend SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper );
-    friend SvStream& operator<<( SvStream& rOStm, const ImplWallpaper& rImplWallpaper );
+    friend SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper );
 
 public:
                     ImplWallpaper();
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index 8c4a6ad9c9c9..09b8ff9101e2 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -82,7 +82,7 @@ SvStream& operator>>(SvStream& rIStream, SgfVector& rVect)
     return rIStream;
 }
 
-SvStream& operator<<(SvStream& rOStream, BmpFileHeader& rHead)
+SvStream& WriteBmpFileHeader(SvStream& rOStream, BmpFileHeader& rHead)
 {
 #if defined OSL_BIGENDIAN
     rHead.Typ     =OSL_SWAPWORD(rHead.Typ     );
@@ -123,7 +123,7 @@ sal_uInt32 BmpFileHeader::GetOfs()
     return sal_uInt32(OfsLo)+0x00010000*sal_uInt32(OfsHi);
 }
 
-SvStream& operator<<(SvStream& rOStream, BmpInfoHeader& rInfo)
+SvStream& WriteBmpInfoHeader(SvStream& rOStream, BmpInfoHeader& rInfo)
 {
 #if defined OSL_BIGENDIAN
     rInfo.Size    =OSL_SWAPDWORD (rInfo.Size    );
@@ -155,7 +155,7 @@ SvStream& operator<<(SvStream& rOStream, BmpInfoHeader& rInfo)
     return rOStream;
 }
 
-SvStream& operator<<(SvStream& rOStream, const RGBQuad& rQuad)
+SvStream& WriteRGBQuad(SvStream& rOStream, const RGBQuad& rQuad)
 {
     rOStream.Write((char*)&rQuad,sizeof(rQuad));
     return rOStream;
@@ -231,14 +231,15 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
     aBmpInfo.ColMust=0;
     pBuf=new sal_uInt8[nWdtOut];
     if (!pBuf) return false;       // Fehler: kein Speichel da
-    rOut<<aBmpHead<<aBmpInfo;
+    WriteBmpFileHeader( rOut, aBmpHead );
+    WriteBmpInfoHeader( rOut, aBmpInfo );
     memset(pBuf,0,nWdtOut);        // Buffer mit Nullen fuellen
 
     if (nColors==2)
     {
 
-        rOut<<RGBQuad(0x00,0x00,0x00); // Schwarz
-        rOut<<RGBQuad(0xFF,0xFF,0xFF); // Weiss
+        WriteRGBQuad( rOut, RGBQuad(0x00,0x00,0x00) ); // Schwarz
+        WriteRGBQuad( rOut, RGBQuad(0xFF,0xFF,0xFF) ); // Weiss
         nOfs=rOut.Tell();
         for (j=0;j<rHead.Ysize;j++)
             rOut.Write((char*)pBuf,nWdtOut);  // Datei erstmal komplett mit Nullen fuellen
@@ -253,22 +254,22 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
     } else if (nColors==16) {
         sal_uInt8 pl2= 0;     // Masken fuer die Planes
 
-        rOut<<RGBQuad(0x00,0x00,0x00); // Schwarz
-        rOut<<RGBQuad(0x24,0x24,0x24); // Grau 80%
-        rOut<<RGBQuad(0x49,0x49,0x49); // Grau 60%
-        rOut<<RGBQuad(0x92,0x92,0x92); // Grau 40%
-        rOut<<RGBQuad(0x6D,0x6D,0x6D); // Grau 30%
-        rOut<<RGBQuad(0xB6,0xB6,0xB6); // Grau 20%
-        rOut<<RGBQuad(0xDA,0xDA,0xDA); // Grau 10%
-        rOut<<RGBQuad(0xFF,0xFF,0xFF); // Weiss
-        rOut<<RGBQuad(0x00,0x00,0x00); // Schwarz
-        rOut<<RGBQuad(0xFF,0x00,0x00); // Rot
-        rOut<<RGBQuad(0x00,0x00,0xFF); // Blau
-        rOut<<RGBQuad(0xFF,0x00,0xFF); // Magenta
-        rOut<<RGBQuad(0x00,0xFF,0x00); // Gruen
-        rOut<<RGBQuad(0xFF,0xFF,0x00); // Gelb
-        rOut<<RGBQuad(0x00,0xFF,0xFF); // Cyan
-        rOut<<RGBQuad(0xFF,0xFF,0xFF); // Weiss
+        WriteRGBQuad( rOut, RGBQuad(0x00,0x00,0x00) ); // Schwarz
+        WriteRGBQuad( rOut, RGBQuad(0x24,0x24,0x24) ); // Grau 80%
+        WriteRGBQuad( rOut, RGBQuad(0x49,0x49,0x49) ); // Grau 60%
+        WriteRGBQuad( rOut, RGBQuad(0x92,0x92,0x92) ); // Grau 40%
+        WriteRGBQuad( rOut, RGBQuad(0x6D,0x6D,0x6D) ); // Grau 30%
+        WriteRGBQuad( rOut, RGBQuad(0xB6,0xB6,0xB6) ); // Grau 20%
+        WriteRGBQuad( rOut, RGBQuad(0xDA,0xDA,0xDA) ); // Grau 10%
+        WriteRGBQuad( rOut, RGBQuad(0xFF,0xFF,0xFF) ); // Weiss
+        WriteRGBQuad( rOut, RGBQuad(0x00,0x00,0x00) ); // Schwarz
+        WriteRGBQuad( rOut, RGBQuad(0xFF,0x00,0x00) ); // Rot
+        WriteRGBQuad( rOut, RGBQuad(0x00,0x00,0xFF) ); // Blau
+        WriteRGBQuad( rOut, RGBQuad(0xFF,0x00,0xFF) ); // Magenta
+        WriteRGBQuad( rOut, RGBQuad(0x00,0xFF,0x00) ); // Gruen
+        WriteRGBQuad( rOut, RGBQuad(0xFF,0xFF,0x00) ); // Gelb
+        WriteRGBQuad( rOut, RGBQuad(0x00,0xFF,0xFF) ); // Cyan
+        WriteRGBQuad( rOut, RGBQuad(0xFF,0xFF,0xFF) ); // Weiss
 
         nOfs=rOut.Tell();
         for (j=0;j<rHead.Ysize;j++)
diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx
index b38d72d57606..268405e65a4e 100644
--- a/vcl/source/filter/sgfbram.hxx
+++ b/vcl/source/filter/sgfbram.hxx
@@ -113,7 +113,7 @@ public:
     void   SetSize(sal_uInt32 Size);
     void   SetOfs(sal_uInt32 Size);
     sal_uInt32 GetOfs();
-    friend SvStream& operator<<(SvStream& rOStream, BmpFileHeader& rHead);
+    friend SvStream& WriteBmpFileHeader(SvStream& rOStream, BmpFileHeader& rHead);
 };
 
 #define BmpInfoHeaderSize 40
@@ -132,7 +132,7 @@ public:
     sal_uInt32 ColUsed;    // Anzahl der verwendeten Farben (0=alle)
     sal_uInt32 ColMust;    // Anzahl der wichtigen Farben (0=alle)
 
-    friend SvStream& operator<<(SvStream& rOStream, BmpInfoHeader& rHead);
+    friend SvStream& WriteBmpInfoHeader(SvStream& rOStream, BmpInfoHeader& rHead);
 };
 
 #define RGBQuadSize 4
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index f2e7c243d7a2..1b204c5246a6 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1295,7 +1295,7 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, sal_Bool bRecordPath )
 
                     SvMemoryStream  aMemStm;
 
-                    aMemStm << aFill;
+                    WriteSvtGraphicFill( aMemStm, aFill );
 
                     mpGDIMetaFile->AddAction( new MetaCommentAction( "XPATHFILL_SEQ_BEGIN", 0,
                                                             static_cast<const sal_uInt8*>(aMemStm.GetData()),
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 92f19b7c4daa..0b128d853740 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -695,7 +695,7 @@ sal_Bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterPara
     return bRet;
 }
 
-SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
+SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation )
 {
     const sal_uInt16 nCount = rAnimation.Count();
 
@@ -720,9 +720,9 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
 
             // Write AnimationBitmap
             WriteDIBBitmapEx(rAnimBmp.aBmpEx, rOStm);
-            rOStm << rAnimBmp.aPosPix;
-            rOStm << rAnimBmp.aSizePix;
-            rOStm << rAnimation.maGlobalSize;
+            WritePair( rOStm, rAnimBmp.aPosPix );
+            WritePair( rOStm, rAnimBmp.aSizePix );
+            WritePair( rOStm, rAnimation.maGlobalSize );
             rOStm.WriteUInt16( (sal_uInt16) ( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ) );
             rOStm.WriteUInt16( (sal_uInt16) rAnimBmp.eDisposal );
             rOStm.WriteUChar( (sal_uInt8) rAnimBmp.bUserInput );
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 1d1b2773c499..8b6d597234b3 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -45,8 +45,8 @@ void ImplReadRect( SvStream& rIStm, Rectangle& rRect )
 
 void ImplWriteRect( SvStream& rOStm, const Rectangle& rRect )
 {
-    rOStm << rRect.TopLeft();
-    rOStm << rRect.BottomRight();
+    WritePair( rOStm, rRect.TopLeft() );
+    WritePair( rOStm, rRect.BottomRight() );
 }
 
 void ImplReadPoly( SvStream& rIStm, Polygon& rPoly )
@@ -99,7 +99,7 @@ void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly )
         rOStm.WriteInt32( (sal_Int32) nSize );
 
         for( sal_uInt16 j = 0; j < nSize; j++ )
-            rOStm << aSimplePoly[ j ];
+            WritePair( rOStm, aSimplePoly[ j ] );
     }
 }
 
@@ -142,7 +142,7 @@ void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode )
 void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode )
 {
     rOStm.WriteInt16( (sal_Int16) rMapMode.GetMapUnit() );
-    rOStm << rMapMode.GetOrigin();
+    WritePair( rOStm, rMapMode.GetOrigin() );
     rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleX().GetNumerator() );
     rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleX().GetDenominator() );
     rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleY().GetNumerator() );
@@ -237,7 +237,7 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont,
     ImplWriteColor( rOStm, rFont.GetColor() );
     ImplWriteColor( rOStm, rFont.GetFillColor() );
     rOStm.Write( aName, 32 );
-    rOStm << rFont.GetSize();
+    WritePair( rOStm, rFont.GetSize() );
     rOStm.WriteInt16( (sal_Int16) 0 ); // no character orientation anymore
     rOStm.WriteInt16( (sal_Int16) rFont.GetOrientation() );
     rOStm.WriteInt16( (sal_Int16) rActualCharSet );
@@ -361,7 +361,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol
 
                     for(sal_uInt16 b(0); b < nPointCount; b++)
                     {
-                        rOStm << rCandidate[b];
+                        WritePair( rOStm, rCandidate[b] );
                     }
 
                     if(rCandidate.HasFlags())
@@ -1386,7 +1386,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_PIXEL_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 18 );
-                rOStm << pAct->GetPoint();
+                WritePair( rOStm, pAct->GetPoint() );
                 ImplWriteColor( rOStm, pAct->GetColor() );
                 nCount++;
             }
@@ -1398,7 +1398,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_POINT_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 12 );
-                rOStm << pAct->GetPoint();
+                WritePair( rOStm, pAct->GetPoint() );
                 nCount++;
             }
             break;
@@ -1445,8 +1445,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_LINE_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 20 );
-                rOStm << pAct->GetStartPoint();
-                rOStm << pAct->GetEndPoint();
+                WritePair( rOStm, pAct->GetStartPoint() );
+                WritePair( rOStm, pAct->GetEndPoint() );
                 nCount++;
 
                 if( bFatLine )
@@ -1516,8 +1516,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.WriteInt16( (sal_Int16) GDI_ARC_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 36 );
                 ImplWriteRect( rOStm, pAct->GetRect() );
-                rOStm << pAct->GetStartPoint();
-                rOStm << pAct->GetEndPoint();
+                WritePair( rOStm, pAct->GetStartPoint() );
+                WritePair( rOStm, pAct->GetEndPoint() );
                 nCount++;
             }
             break;
@@ -1529,8 +1529,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.WriteInt16( (sal_Int16) GDI_PIE_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 36 );
                 ImplWriteRect( rOStm, pAct->GetRect() );
-                rOStm << pAct->GetStartPoint();
-                rOStm << pAct->GetEndPoint();
+                WritePair( rOStm, pAct->GetStartPoint() );
+                WritePair( rOStm, pAct->GetEndPoint() );
                 nCount++;
             }
             break;
@@ -1547,7 +1547,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.WriteInt32( (sal_Int32) nPoints );
 
                 for( sal_uInt16 n = 0; n < nPoints; n++ )
-                    rOStm << aChordPoly[ n ];
+                    WritePair( rOStm, aChordPoly[ n ] );
                 nCount++;
             }
             break;
@@ -1605,7 +1605,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 for( sal_uInt16 n = 0; n < nPoints; n++ )
                 {
-                    rOStm << aSimplePoly[ n ];
+                    WritePair( rOStm, aSimplePoly[ n ] );
                 }
 
                 nCount++;
@@ -1654,7 +1654,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.WriteInt32( (sal_Int32) nPoints );
 
                 for( sal_uInt16 n = 0; n < nPoints; n++ )
-                    rOStm << aSimplePoly[ n ];
+                    WritePair( rOStm, aSimplePoly[ n ] );
 
                 nCount++;
 
@@ -1692,7 +1692,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_TEXT_ACTION );
                 rOStm.WriteInt32( ( 24 + ( nStrLen + 1 ) ) );
-                rOStm << pAct->GetPoint();
+                WritePair( rOStm, pAct->GetPoint() );
                 rOStm.WriteInt32( pAct->GetIndex() );
                 rOStm.WriteInt32( pAct->GetLen() );
                 rOStm.WriteInt32( nStrLen );
@@ -1730,7 +1730,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_TEXTARRAY_ACTION );
                 rOStm.WriteInt32( ( 28 + ( nLen + 1 ) + ( nAryLen * 4 ) ) );
-                rOStm << pAct->GetPoint();
+                WritePair( rOStm, pAct->GetPoint() );
                 rOStm.WriteInt32( 0 );
                 rOStm.WriteInt32( nLen );
                 rOStm.WriteInt32( nLen );
@@ -1757,7 +1757,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_STRETCHTEXT_ACTION );
                 rOStm.WriteInt32( ( 28 + ( nStrLen + 1 ) ) );
-                rOStm << pAct->GetPoint();
+                WritePair( rOStm, pAct->GetPoint() );
                 rOStm.WriteInt32( pAct->GetIndex() );
                 rOStm.WriteInt32( pAct->GetLen() );
                 rOStm.WriteInt32( nStrLen );
@@ -1773,7 +1773,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_BITMAP_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 12 );
-                rOStm << pAct->GetPoint();
+                WritePair( rOStm, pAct->GetPoint() );
                 WriteDIB(pAct->GetBitmap(), rOStm, false, true);
                 nCount++;
             }
@@ -1785,8 +1785,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALE_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 20 );
-                rOStm << pAct->GetPoint();
-                rOStm << pAct->GetSize();
+                WritePair( rOStm, pAct->GetPoint() );
+                WritePair( rOStm, pAct->GetSize() );
                 WriteDIB(pAct->GetBitmap(), rOStm, false, true);
                 nCount++;
             }
@@ -1798,10 +1798,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALEPART_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 36 );
-                rOStm << pAct->GetDestPoint();
-                rOStm << pAct->GetDestSize();
-                rOStm << pAct->GetSrcPoint();
-                rOStm << pAct->GetSrcSize();
+                WritePair( rOStm, pAct->GetDestPoint() );
+                WritePair( rOStm, pAct->GetDestSize() );
+                WritePair( rOStm, pAct->GetSrcPoint() );
+                WritePair( rOStm, pAct->GetSrcSize() );
                 WriteDIB(pAct->GetBitmap(), rOStm, false, true);
                 nCount++;
             }
@@ -1814,7 +1814,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_BITMAP_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 12 );
-                rOStm << pAct->GetPoint();
+                WritePair( rOStm, pAct->GetPoint() );
                 WriteDIB(aBmp, rOStm, false, true);
                 nCount++;
             }
@@ -1827,8 +1827,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALE_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 20 );
-                rOStm << pAct->GetPoint();
-                rOStm << pAct->GetSize();
+                WritePair( rOStm, pAct->GetPoint() );
+                WritePair( rOStm, pAct->GetSize() );
                 WriteDIB(aBmp, rOStm, false, true);
                 nCount++;
             }
@@ -1841,10 +1841,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALEPART_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 36 );
-                rOStm << pAct->GetDestPoint();
-                rOStm << pAct->GetDestSize();
-                rOStm << pAct->GetSrcPoint();
-                rOStm << pAct->GetSrcSize();
+                WritePair( rOStm, pAct->GetDestPoint() );
+                WritePair( rOStm, pAct->GetDestSize() );
+                WritePair( rOStm, pAct->GetSrcPoint() );
+                WritePair( rOStm, pAct->GetSrcSize() );
                 WriteDIB(aBmp, rOStm, false, true);
                 nCount++;
             }
@@ -1884,7 +1884,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.SeekRel( 4 );
 
                 // write data
-                rOStm << pA->GetPolyPolygon() << pA->GetGradient();
+                WritePolyPolygon( rOStm, pA->GetPolyPolygon() );
+                WriteGradient( rOStm, pA->GetGradient() );
                 rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
 
                 // calculate and write ActionSize of comment
@@ -1950,7 +1951,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
 
                 rOStm.WriteInt16( (sal_Int16) GDI_ISECTCLIPREGION_ACTION );
                 rOStm.WriteInt32( (sal_Int32) 20 );
-                rOStm << pAct->GetRect();
+                WriteRectangle( rOStm, pAct->GetRect() );
                 nCount++;
             }
             break;
@@ -2139,7 +2140,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.SeekRel( 4 );
 
                 // write comment data
-                rOStm << rPolyPoly;
+                WritePolyPolygon( rOStm, rPolyPoly );
                 rOStm.WriteInt16( nTrans );
                 rOStm.WriteInt32( (sal_Int32) 15 ); // number of actions that follow this comment
 
@@ -2200,7 +2201,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.SeekRel( 4 );
 
                 // write comment data
-                rOStm << rTransMtf << rPos << rSize << rGradient;
+                WriteGDIMetaFile( rOStm, rTransMtf );
+                WritePair( rOStm, rPos );
+                WritePair( rOStm, rSize );
+                WriteGradient( rOStm, rGradient );
 
                 // calculate and write ActionSize of comment
                 nNewPos = rOStm.Tell();
@@ -2257,8 +2261,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.SeekRel( 4 );
 
                 // write comment data
-                rOStm << rPolyPoly;
-                rOStm << rHatch;
+                WritePolyPolygon( rOStm, rPolyPoly );
+                WriteHatch( rOStm, rHatch );
 
                 // calculate and write ActionSize of comment
                 nNewPos = rOStm.Tell();
@@ -2300,7 +2304,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.SeekRel( 4 );
 
                 // write data
-                rOStm << rRefPoint;
+                WritePair( rOStm, rRefPoint );
                 rOStm.WriteUChar( bSet );
                 rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
 
@@ -2329,7 +2333,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.SeekRel( 4 );
 
                 // write data
-                rOStm << rColor;
+                WriteColor( rOStm, rColor );
                 rOStm.WriteUChar( bSet );
                 rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
 
@@ -2360,7 +2364,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.SeekRel( 4 );
 
                 // write data
-                rOStm << rStartPt;
+                WritePair( rOStm, rStartPt );
                 rOStm.WriteInt32( nWidth ).WriteUInt32( static_cast<sal_uInt32>(eStrikeout) ).WriteUInt32( static_cast<sal_uInt32>(eUnderline) );
                 rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
 
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 737385cc7244..79bc942e6445 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1561,7 +1561,7 @@ bool WriteDIBBitmapEx(
         }
         else if(TRANSPARENT_COLOR == rSource.eTransparent)
         {
-            rOStm << rSource.aTransparentColor;
+            WriteColor( rOStm, rSource.aTransparentColor );
             return true;
         }
     }
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 492141d02b62..e37d30961957 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -706,12 +706,12 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font )
     return rIStm;
 }
 
-SvStream& operator<<( SvStream& rOStm, const Impl_Font& rImpl_Font )
+SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font )
 {
     VersionCompat aCompat( rOStm, STREAM_WRITE, 3 );
     rOStm.WriteUniOrByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() );
     rOStm.WriteUniOrByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() );
-    rOStm << rImpl_Font.maSize;
+    WritePair( rOStm, rImpl_Font.maSize );
 
     rOStm.WriteUInt16( (sal_uInt16) GetStoreCharSet( rImpl_Font.meCharSet ) );
     rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meFamily );
@@ -748,9 +748,9 @@ SvStream& operator>>( SvStream& rIStm, Font& rFont )
     return( rIStm >> *rFont.mpImplFont );
 }
 
-SvStream& operator<<( SvStream& rOStm, const Font& rFont )
+SvStream& WriteFont( SvStream& rOStm, const Font& rFont )
 {
-    return( rOStm << *rFont.mpImplFont );
+    return WriteImpl_Font( rOStm, *rFont.mpImplFont );
 }
 
 namespace
diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx
index 74d370aa4ff4..6d3e213be91d 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -232,7 +232,7 @@ namespace
     {
         // write SvtGraphicFill
         SvMemoryStream aMemStm;
-        aMemStm << rStroke;
+        WriteSvtGraphicStroke( aMemStm, rStroke );
         rTarget.AddAction(
             new MetaCommentAction(
                 "XPATHSTROKE_SEQ_BEGIN",
@@ -245,7 +245,7 @@ namespace
     {
         // write SvtGraphicFill
         SvMemoryStream aMemStm;
-        aMemStm << rFilling;
+        WriteSvtGraphicFill( aMemStm, rFilling );
         rTarget.AddAction(
             new MetaCommentAction(
                 "XPATHFILL_SEQ_BEGIN",
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 6abda832bc90..51d929d13fc7 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1201,7 +1201,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
                                     Polygon aPath;
                                     aStroke.getPath( aPath );
                                     aStroke.setPath( ImplGetRotatedPolygon( aPath, aRotAnchor, aRotOffset, fSin, fCos ) );
-                                    aDest << aStroke;
+                                    WriteSvtGraphicStroke( aDest, aStroke );
                                     aMtf.AddAction( new MetaCommentAction( "XPATHSTROKE_SEQ_BEGIN", 0,
                                                         static_cast<const sal_uInt8*>( aDest.GetData()), aDest.Tell() ) );
                                 }
@@ -1212,7 +1212,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
                                     PolyPolygon aPath;
                                     aFill.getPath( aPath );
                                     aFill.setPath( ImplGetRotatedPolyPolygon( aPath, aRotAnchor, aRotOffset, fSin, fCos ) );
-                                    aDest << aFill;
+                                    WriteSvtGraphicFill( aDest, aFill );
                                     aMtf.AddAction( new MetaCommentAction( "XPATHFILL_SEQ_BEGIN", 0,
                                                         static_cast<const sal_uInt8*>( aDest.GetData()), aDest.Tell() ) );
                                 }
@@ -2798,7 +2798,7 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
     return rIStm;
 }
 
-SvStream& operator<<( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile )
+SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile )
 {
     if( !rOStm.GetError() )
     {
@@ -2848,8 +2848,8 @@ SvStream& GDIMetaFile::Write( SvStream& rOStm )
     pCompat = new VersionCompat( rOStm, STREAM_WRITE, 1 );
 
     rOStm.WriteUInt32( nStmCompressMode );
-    rOStm << aPrefMapMode;
-    rOStm << aPrefSize;
+    WriteMapMode( rOStm, aPrefMapMode );
+    WritePair( rOStm, aPrefSize );
     rOStm.WriteUInt32( (sal_uInt32) GetActionSize() );
 
     delete pCompat;
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 2bef53d0b3ba..d04b146cff63 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -269,7 +269,7 @@ sal_Bool GfxLink::ExportNative( SvStream& rOStream ) const
     return ( rOStream.GetError() == ERRCODE_NONE );
 }
 
-SvStream& operator<<( SvStream& rOStream, const GfxLink& rGfxLink )
+SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink )
 {
     VersionCompat* pCompat = new VersionCompat( rOStream, STREAM_WRITE, 2 );
 
@@ -277,7 +277,8 @@ SvStream& operator<<( SvStream& rOStream, const GfxLink& rGfxLink )
     rOStream.WriteUInt16( (sal_uInt16) rGfxLink.GetType() ).WriteUInt32( rGfxLink.GetDataSize() ).WriteUInt32( rGfxLink.GetUserId() );
 
     // Version 2
-    rOStream << rGfxLink.GetPrefSize() << rGfxLink.GetPrefMapMode();
+    WritePair( rOStream, rGfxLink.GetPrefSize() );
+    WriteMapMode( rOStream, rGfxLink.GetPrefMapMode() );
 
     delete pCompat;
 
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 9ad19b034010..89d3ec182b62 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -306,12 +306,13 @@ SvStream& operator>>( SvStream& rIStm, Impl_Gradient& rImpl_Gradient )
     return rIStm;
 }
 
-SvStream& operator<<( SvStream& rOStm, const Impl_Gradient& rImpl_Gradient )
+SvStream& WriteImpl_Gradient( SvStream& rOStm, const Impl_Gradient& rImpl_Gradient )
 {
     VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
 
     rOStm.WriteUInt16( (sal_uInt16) rImpl_Gradient.meStyle );
-    rOStm << rImpl_Gradient.maStartColor << rImpl_Gradient.maEndColor;
+    WriteColor( rOStm, rImpl_Gradient.maStartColor );
+    WriteColor( rOStm, rImpl_Gradient.maEndColor );
     rOStm.WriteUInt16( rImpl_Gradient.mnAngle )
          .WriteUInt16( rImpl_Gradient.mnBorder )
          .WriteUInt16( rImpl_Gradient.mnOfsX )
@@ -329,9 +330,9 @@ SvStream& operator>>( SvStream& rIStm, Gradient& rGradient )
     return( rIStm >> *rGradient.mpImplGradient );
 }
 
-SvStream& operator<<( SvStream& rOStm, const Gradient& rGradient )
+SvStream& WriteGradient( SvStream& rOStm, const Gradient& rGradient )
 {
-    return( rOStm << *rGradient.mpImplGradient );
+    return WriteImpl_Gradient( rOStm, *rGradient.mpImplGradient );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index ccdb11261f11..afa17a3aff5f 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -311,7 +311,7 @@ void Graphic::Load( SvStream& rIStm )
 
 void Graphic::Save( SvStream& rOStm )
 {
-    rOStm << *this;
+    WriteGraphic( rOStm, *this );
 }
 
 void Graphic::Assign( const SvDataCopyStream& rCopyStream )
@@ -577,9 +577,9 @@ SvStream& operator>>( SvStream& rIStream, Graphic& rGraphic )
     return rIStream >> *rGraphic.mpImpGraphic;
 }
 
-SvStream& operator<<( SvStream& rOStream, const Graphic& rGraphic )
+SvStream& WriteGraphic( SvStream& rOStream, const Graphic& rGraphic )
 {
-    return rOStream << *rGraphic.mpImpGraphic;
+    return WriteImpGraphic( rOStream, *rGraphic.mpImpGraphic );
 }
 
 const SvgDataPtr& Graphic::getSvgData() const
diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx
index 37c323c17591..1ea6906ade0a 100644
--- a/vcl/source/gdi/graphictools.cxx
+++ b/vcl/source/gdi/graphictools.cxx
@@ -135,7 +135,7 @@ void SvtGraphicStroke::scale( double fXScale, double fYScale )
     maEndArrow.Scale( fXScale, fYScale );
 }
 
-SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass )
+SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass )
 {
     VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
 
@@ -287,12 +287,12 @@ void SvtGraphicFill::setPath( const PolyPolygon& rPath )
     maPath = rPath;
 }
 
-SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass )
+SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass )
 {
     VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
 
     rClass.maPath.Write( rOStm );
-    rOStm << rClass.maFillColor;
+    WriteColor( rOStm, rClass.maFillColor );
     rOStm.WriteDouble( rClass.mfTransparency );
     sal_uInt16 nTmp = sal::static_int_cast<sal_uInt16>( rClass.maFillRule );
     rOStm.WriteUInt16( nTmp );
@@ -305,13 +305,13 @@ SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass )
     rOStm.WriteUInt16( nTmp );
     nTmp = sal::static_int_cast<sal_uInt16>( rClass.maHatchType );
     rOStm.WriteUInt16( nTmp );
-    rOStm << rClass.maHatchColor;
+    WriteColor( rOStm, rClass.maHatchColor );
     nTmp = sal::static_int_cast<sal_uInt16>( rClass.maGradientType );
     rOStm.WriteUInt16( nTmp );
-    rOStm << rClass.maGradient1stColor;
-    rOStm << rClass.maGradient2ndColor;
+    WriteColor( rOStm, rClass.maGradient1stColor );
+    WriteColor( rOStm, rClass.maGradient2ndColor );
     rOStm.WriteInt32( rClass.maGradientStepCount );
-    rOStm << rClass.maFillGraphic;
+    WriteGraphic( rOStm, rClass.maFillGraphic );
 
     return rOStm;
 }
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index d1867ce18600..b55b22abed2a 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.cxx
@@ -133,11 +133,12 @@ SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch )
     return rIStm;
 }
 
-SvStream& operator<<( SvStream& rOStm, const ImplHatch& rImplHatch )
+SvStream& WriteImplHatch( SvStream& rOStm, const ImplHatch& rImplHatch )
 {
     VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
 
-    rOStm.WriteUInt16( (sal_uInt16) rImplHatch.meStyle ) << rImplHatch.maColor;
+    rOStm.WriteUInt16( (sal_uInt16) rImplHatch.meStyle );
+    WriteColor( rOStm, rImplHatch.maColor );
     //#fdo39428 SvStream no longer supports operator<<(long)
     rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rImplHatch.mnDistance) ).WriteUInt16( rImplHatch.mnAngle );
 
@@ -150,9 +151,9 @@ SvStream& operator>>( SvStream& rIStm, Hatch& rHatch )
     return( rIStm >> *rHatch.mpImplHatch );
 }
 
-SvStream& operator<<( SvStream& rOStm, const Hatch& rHatch )
+SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch )
 {
-    return( rOStm << *rHatch.mpImplHatch );
+    return WriteImplHatch( rOStm, *rHatch.mpImplHatch );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index df6de2a60d90..387ee0b22f8e 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1247,8 +1247,8 @@ sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
             nDataFieldPos = rOStm.Tell();
             rOStm << (sal_Int32) 0;
 
-            rOStm << aSize;
-            rOStm << aMapMode;
+            WritePair( rOStm, aSize );
+            WriteMapMode( rOStm, aMapMode );
 
             delete pCompat;
         }
@@ -1278,7 +1278,7 @@ sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
             const sal_uLong nDataStart = rOStm.Tell();
 
             if( ImplIsSupportedGraphic() )
-                rOStm << *this;
+                WriteImpGraphic( rOStm, *this );
 
             if( !rOStm.GetError() )
             {
@@ -1572,7 +1572,7 @@ sal_Bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const
                 bResult = mpGfxLink->ExportNative( rOStm );
             else
             {
-                rOStm << *this;
+                WriteImpGraphic( rOStm, *this );
                 bResult = ( rOStm.GetError() == ERRCODE_NONE );
             }
         }
@@ -1738,7 +1738,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
     return rIStm;
 }
 
-SvStream& operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic )
+SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic )
 {
     if( !rOStm.GetError() )
     {
@@ -1759,7 +1759,7 @@ SvStream& operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic )
 
                 rImpGraphic.mpGfxLink->SetPrefMapMode( rImpGraphic.ImplGetPrefMapMode() );
                 rImpGraphic.mpGfxLink->SetPrefSize( rImpGraphic.ImplGetPrefSize() );
-                rOStm << *rImpGraphic.mpGfxLink;
+                WriteGfxLink( rOStm, *rImpGraphic.mpGfxLink );
             }
             else
             {
@@ -1791,7 +1791,7 @@ SvStream& operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic )
                         }
                         else if( rImpGraphic.ImplIsAnimated())
                         {
-                            rOStm << *rImpGraphic.mpAnimation;
+                            WriteAnimation( rOStm, *rImpGraphic.mpAnimation );
                         }
                         else
                         {
@@ -1803,7 +1803,7 @@ SvStream& operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic )
                     default:
                     {
                         if( rImpGraphic.ImplIsSupportedGraphic() )
-                            rOStm << rImpGraphic.maMetaFile;
+                            WriteGDIMetaFile( rOStm, rImpGraphic.maMetaFile );
                     }
                     break;
                 }
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 96c12e2e7c6d..9184dc6199a7 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -311,7 +311,7 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
     return rIStream;
 }
 
-SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
+SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup )
 {
     DBG_ASSERTWARNING( rOStream.GetVersion(), "JobSetup::<< - Solar-Version not set on rOStream" );
 
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx
index b7dc0f746feb..0151836257ba 100644
--- a/vcl/source/gdi/lineinfo.cxx
+++ b/vcl/source/gdi/lineinfo.cxx
@@ -268,7 +268,7 @@ SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo )
 
 // -----------------------------------------------------------------------
 
-SvStream& operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo )
+SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo )
 {
     VersionCompat aCompat( rOStm, STREAM_WRITE, 4 );
 
@@ -300,9 +300,9 @@ SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo )
 
 // -----------------------------------------------------------------------
 
-SvStream& operator<<( SvStream& rOStm, const LineInfo& rLineInfo )
+SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo )
 {
-    return( rOStm << *rLineInfo.mpImplLineInfo );
+    return WriteImplLineInfo( rOStm, *rLineInfo.mpImplLineInfo );
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index 8c1a53c914dc..d4286d57361d 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -55,14 +55,14 @@ SvStream& operator>>( SvStream& rIStm, ImplMapMode& rImplMapMode )
     return rIStm;
 }
 
-SvStream& operator<<( SvStream& rOStm, const ImplMapMode& rImplMapMode )
+SvStream& WriteImplMapMode( SvStream& rOStm, const ImplMapMode& rImplMapMode )
 {
     VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
 
-    rOStm.WriteUInt16( (sal_uInt16) rImplMapMode.meUnit ) <<
-             rImplMapMode.maOrigin <<
-             rImplMapMode.maScaleX <<
-             rImplMapMode.maScaleY;
+    rOStm.WriteUInt16( (sal_uInt16) rImplMapMode.meUnit );
+    WritePair( rOStm, rImplMapMode.maOrigin );
+    WriteFraction( rOStm, rImplMapMode.maScaleX );
+    WriteFraction( rOStm, rImplMapMode.maScaleY );
     rOStm.WriteUChar( rImplMapMode.mbSimple );
 
     return rOStm;
@@ -237,9 +237,9 @@ SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode )
     return (rIStm >> *rMapMode.mpImplMapMode);
 }
 
-SvStream& operator<<( SvStream& rOStm, const MapMode& rMapMode )
+SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode )
 {
-    return (rOStm << *rMapMode.mpImplMapMode);
+    return WriteImplMapMode( rOStm, *rMapMode.mpImplMapMode );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index c622fecfb57d..3414abe46f32 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -289,7 +289,7 @@ sal_Bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const
 void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maPt;
+    WritePair( rOStm, maPt );
     maColor.Write( rOStm, sal_True );
 }
 
@@ -356,7 +356,7 @@ sal_Bool MetaPointAction::Compare( const MetaAction& rMetaAction ) const
 void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maPt;
+    WritePair( rOStm, maPt );
 }
 
 // ------------------------------------------------------------------------
@@ -442,8 +442,9 @@ void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 2, pData );
 
-    rOStm << maStartPt << maEndPt;  // Version 1
-    rOStm << maLineInfo;            // Version 2
+    WritePair( rOStm, maStartPt );
+    WritePair( rOStm, maEndPt );  // Version 1
+    WriteLineInfo( rOStm, maLineInfo );            // Version 2
 }
 
 // ------------------------------------------------------------------------
@@ -516,7 +517,7 @@ sal_Bool MetaRectAction::Compare( const MetaAction& rMetaAction ) const
 void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRect;
+    WriteRectangle( rOStm, maRect );
 }
 
 // ------------------------------------------------------------------------
@@ -588,7 +589,7 @@ sal_Bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const
 void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRect;
+    WriteRectangle( rOStm, maRect );
     rOStm.WriteUInt32( mnHorzRound ).WriteUInt32( mnVertRound );
 }
 
@@ -654,7 +655,7 @@ sal_Bool MetaEllipseAction::Compare( const MetaAction& rMetaAction ) const
 void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRect;
+    WriteRectangle( rOStm, maRect );
 }
 
 // ------------------------------------------------------------------------
@@ -728,7 +729,9 @@ sal_Bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const
 void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRect << maStartPt << maEndPt;
+    WriteRectangle( rOStm, maRect );
+    WritePair( rOStm, maStartPt );
+    WritePair( rOStm, maEndPt );
 }
 
 // ------------------------------------------------------------------------
@@ -802,7 +805,9 @@ sal_Bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const
 void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRect << maStartPt << maEndPt;
+    WriteRectangle( rOStm, maRect );
+    WritePair( rOStm, maStartPt );
+    WritePair( rOStm, maEndPt );
 }
 
 // ------------------------------------------------------------------------
@@ -876,7 +881,9 @@ sal_Bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const
 void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRect << maStartPt << maEndPt;
+    WriteRectangle( rOStm, maRect );
+    WritePair( rOStm, maStartPt );
+    WritePair( rOStm, maEndPt );
 }
 
 // ------------------------------------------------------------------------
@@ -964,8 +971,8 @@ void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     Polygon aSimplePoly;
     maPoly.AdaptiveSubdivide( aSimplePoly );
 
-    rOStm << aSimplePoly;                               // Version 1
-    rOStm << maLineInfo;                                // Version 2
+    WritePolygon( rOStm, aSimplePoly );                               // Version 1
+    WriteLineInfo( rOStm, maLineInfo );                                // Version 2
 
     sal_uInt8 bHasPolyFlags = maPoly.HasFlags();        // Version 3
     rOStm.WriteUChar( bHasPolyFlags );
@@ -1051,7 +1058,7 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
     Polygon aSimplePoly;                            // Version 1
     maPoly.AdaptiveSubdivide( aSimplePoly );
-    rOStm << aSimplePoly;
+    WritePolygon( rOStm, aSimplePoly );
 
     sal_uInt8 bHasPolyFlags = maPoly.HasFlags();    // Version 2
     rOStm.WriteUChar( bHasPolyFlags );
@@ -1143,7 +1150,7 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
         if ( rPoly.HasFlags() )
             nNumberOfComplexPolygons++;
         rPoly.AdaptiveSubdivide( aSimplePoly );
-        rOStm << aSimplePoly;
+        WritePolygon( rOStm, aSimplePoly );
     }
 
     rOStm.WriteUInt16( nNumberOfComplexPolygons );                  // Version 2
@@ -1242,7 +1249,7 @@ sal_Bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 2, pData );
-    rOStm  << maPt;
+    WritePair( rOStm, maPt );
     rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
     rOStm.WriteInt32(mnIndex);
     rOStm.WriteInt32(mnLen);
@@ -1379,7 +1386,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     const sal_Int32 nAryLen = mpDXAry ? mnLen : 0;
 
     WRITE_BASE_COMPAT( rOStm, 2, pData );
-    rOStm  << maStartPt;
+    WritePair( rOStm, maStartPt );
     rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
     rOStm.WriteInt32(mnIndex);
     rOStm.WriteInt32(mnLen);
@@ -1516,7 +1523,7 @@ sal_Bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const
 void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 2, pData );
-    rOStm  << maPt;
+    WritePair( rOStm, maPt );
     rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
     rOStm.WriteUInt32( mnWidth );
     rOStm.WriteInt32( mnIndex );
@@ -1599,7 +1606,7 @@ sal_Bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 2, pData );
-    rOStm  << maRect;
+    WriteRectangle( rOStm, maRect );
     rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
     rOStm.WriteUInt16( mnStyle );
 
@@ -1687,7 +1694,7 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WRITE_BASE_COMPAT( rOStm, 2, pData );
 
     //#fdo39428 SvStream no longer supports operator<<(long)
-    rOStm << maPos;
+    WritePair( rOStm, maPos );
     rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnWidth) );
     rOStm.WriteUInt32( static_cast<sal_uInt32>(meStrikeout) );
     rOStm.WriteUInt32( static_cast<sal_uInt32>(meUnderline) );
@@ -1776,7 +1783,7 @@ void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     {
         WRITE_BASE_COMPAT( rOStm, 1, pData );
         WriteDIB(maBmp, rOStm, false, true);
-        rOStm << maPt;
+        WritePair( rOStm, maPt );
     }
 }
 
@@ -1854,7 +1861,8 @@ void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     {
         WRITE_BASE_COMPAT( rOStm, 1, pData );
         WriteDIB(maBmp, rOStm, false, true);
-        rOStm << maPt << maSz;
+        WritePair( rOStm, maPt );
+        WritePair( rOStm, maSz );
     }
 }
 
@@ -1937,7 +1945,10 @@ void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     {
         WRITE_BASE_COMPAT( rOStm, 1, pData );
         WriteDIB(maBmp, rOStm, false, true);
-        rOStm << maDstPt << maDstSz << maSrcPt << maSrcSz;
+        WritePair( rOStm, maDstPt );
+        WritePair( rOStm, maDstSz );
+        WritePair( rOStm, maSrcPt );
+        WritePair( rOStm, maSrcSz );
     }
 }
 
@@ -2009,7 +2020,7 @@ void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     {
         WRITE_BASE_COMPAT( rOStm, 1, pData );
         WriteDIBBitmapEx(maBmpEx, rOStm);
-        rOStm << maPt;
+        WritePair( rOStm, maPt );
     }
 }
 
@@ -2087,7 +2098,8 @@ void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     {
         WRITE_BASE_COMPAT( rOStm, 1, pData );
         WriteDIBBitmapEx(maBmpEx, rOStm);
-        rOStm << maPt << maSz;
+        WritePair( rOStm, maPt );
+        WritePair( rOStm, maSz );
     }
 }
 
@@ -2170,7 +2182,10 @@ void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData
     {
         WRITE_BASE_COMPAT( rOStm, 1, pData );
         WriteDIBBitmapEx(maBmpEx, rOStm);
-        rOStm << maDstPt << maDstSz << maSrcPt << maSrcSz;
+        WritePair( rOStm, maDstPt );
+        WritePair( rOStm, maDstSz );
+        WritePair( rOStm, maSrcPt );
+        WritePair( rOStm, maSrcSz );
     }
 }
 
@@ -2246,7 +2261,7 @@ void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     {
         WRITE_BASE_COMPAT( rOStm, 1, pData );
         WriteDIB(maBmp, rOStm, false, true);
-        rOStm << maPt;
+        WritePair( rOStm, maPt );
     }
 }
 
@@ -2327,7 +2342,8 @@ void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     {
         WRITE_BASE_COMPAT( rOStm, 1, pData );
         WriteDIB(maBmp, rOStm, false, true);
-        rOStm << maPt << maSz;
+        WritePair( rOStm, maPt );
+        WritePair( rOStm, maSz );
     }
 }
 
@@ -2414,7 +2430,10 @@ void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
         WRITE_BASE_COMPAT( rOStm, 1, pData );
         WriteDIB(maBmp, rOStm, false, true);
         maColor.Write( rOStm, sal_True );
-        rOStm << maDstPt << maDstSz << maSrcPt << maSrcSz;
+        WritePair( rOStm, maDstPt );
+        WritePair( rOStm, maDstSz );
+        WritePair( rOStm, maSrcPt );
+        WritePair( rOStm, maSrcSz );
     }
 }
 
@@ -2484,7 +2503,8 @@ sal_Bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const
 void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRect << maGradient;
+    WriteRectangle( rOStm, maRect );
+    WriteGradient( rOStm, maGradient );
 }
 
 // ------------------------------------------------------------------------
@@ -2570,8 +2590,8 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     PolyPolygon aNoCurvePolyPolygon;
     maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon);
 
-    rOStm << aNoCurvePolyPolygon;
-    rOStm << maGradient;
+    WritePolyPolygon( rOStm, aNoCurvePolyPolygon );
+    WriteGradient( rOStm, maGradient );
 }
 
 // ------------------------------------------------------------------------
@@ -2644,8 +2664,8 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     PolyPolygon aNoCurvePolyPolygon;
     maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon);
 
-    rOStm << aNoCurvePolyPolygon;
-    rOStm << maHatch;
+    WritePolyPolygon( rOStm, aNoCurvePolyPolygon );
+    WriteHatch( rOStm, maHatch );
 }
 
 // ------------------------------------------------------------------------
@@ -2713,7 +2733,7 @@ sal_Bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const
 void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maWallpaper;
+    WriteWallpaper( rOStm, maWallpaper );
 }
 
 // ------------------------------------------------------------------------
@@ -2783,7 +2803,7 @@ sal_Bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const
 void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRegion;
+    WriteRegion( rOStm, maRegion );
     rOStm.WriteUChar( mbClip );
 }
 
@@ -2849,7 +2869,7 @@ sal_Bool MetaISectRectClipRegionAction::Compare( const MetaAction& rMetaAction )
 void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRect;
+    WriteRectangle( rOStm, maRect );
 }
 
 // ------------------------------------------------------------------------
@@ -2914,7 +2934,7 @@ sal_Bool MetaISectRegionClipRegionAction::Compare( const MetaAction& rMetaAction
 void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRegion;
+    WriteRegion( rOStm, maRegion );
 }
 
 // ------------------------------------------------------------------------
@@ -3435,7 +3455,7 @@ sal_Bool MetaMapModeAction::Compare( const MetaAction& rMetaAction ) const
 void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maMapMode;
+    WriteMapMode( rOStm, maMapMode );
 }
 
 // ------------------------------------------------------------------------
@@ -3505,7 +3525,7 @@ sal_Bool MetaFontAction::Compare( const MetaAction& rMetaAction ) const
 void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maFont;
+    WriteFont( rOStm, maFont );
     pData->meActualCharSet = maFont.GetCharSet();
     if ( pData->meActualCharSet == RTL_TEXTENCODING_DONTKNOW )
         pData->meActualCharSet = osl_getThreadTextEncoding();
@@ -3730,7 +3750,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     PolyPolygon aNoCurvePolyPolygon;
     maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon);
 
-    rOStm << aNoCurvePolyPolygon;
+    WritePolyPolygon( rOStm, aNoCurvePolyPolygon );
     rOStm.WriteUInt16( mnTransPercent );
 }
 
@@ -3809,7 +3829,9 @@ void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pDat
     WRITE_BASE_COMPAT( rOStm, 1, pData );
 
     maMtf.Write( rOStm );
-    rOStm << maPoint << maSize << maGradient;
+    WritePair( rOStm,  maPoint );
+    WritePair( rOStm, maSize );
+    WriteGradient( rOStm, maGradient );
 }
 
 // ------------------------------------------------------------------------
@@ -3884,9 +3906,9 @@ sal_Bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const
 void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maGfxLink;
-    rOStm << maPoint;
-    rOStm << maSize;
+    WriteGfxLink( rOStm, maGfxLink );
+    WritePair( rOStm, maPoint );
+    WritePair( rOStm, maSize );
     maSubst.Write( rOStm );
 }
 
@@ -3946,7 +3968,7 @@ sal_Bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const
 void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    rOStm << maRefPoint;
+    WritePair( rOStm, maRefPoint );
     rOStm.WriteUChar( mbSet );
 }
 
@@ -4062,7 +4084,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
                     aEndArrow.Move(nXMove, nYMove);
                     aStroke.setEndArrow(aEndArrow);
 
-                    aDest << aStroke;
+                    WriteSvtGraphicStroke( aDest, aStroke );
                 }
                 else
                 {
@@ -4074,7 +4096,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
                     aPath.Move( nXMove, nYMove );
                     aFill.setPath( aPath );
 
-                    aDest << aFill;
+                    WriteSvtGraphicFill( aDest, aFill );
                 }
                 delete[] mpData;
                 ImplInitDynamicData( static_cast<const sal_uInt8*>( aDest.GetData() ), aDest.Tell() );
@@ -4104,7 +4126,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
                     SvtGraphicStroke aStroke;
                     aMemStm >> aStroke;
                     aStroke.scale( fXScale, fYScale );
-                    aDest << aStroke;
+                    WriteSvtGraphicStroke( aDest, aStroke );
                 }
                 else
                 {
@@ -4114,7 +4136,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
                     aFill.getPath( aPath );
                     aPath.Scale( fXScale, fYScale );
                     aFill.setPath( aPath );
-                    aDest << aFill;
+                    WriteSvtGraphicFill( aDest, aFill );
                 }
                 delete[] mpData;
                 ImplInitDynamicData( static_cast<const sal_uInt8*>( aDest.GetData() ), aDest.Tell() );
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 5ab65becab24..375be676d44a 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -249,7 +249,7 @@ bool QueueInfo::operator==( const QueueInfo& rInfo ) const
 }
 
 
-SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo )
+SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo )
 {
     VersionCompat aCompat( rOStream, STREAM_WRITE, 1 );
 
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index e013c1b6bc22..b2ad73285b05 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -1617,7 +1617,7 @@ SvStream& operator>>(SvStream& rIStrm, Region& rRegion)
     return rIStrm;
 }
 
-SvStream& operator<<( SvStream& rOStrm, const Region& rRegion )
+SvStream& WriteRegion( SvStream& rOStrm, const Region& rRegion )
 {
     const sal_uInt16 nVersion(2);
     VersionCompat aCompat(rOStrm, STREAM_WRITE, nVersion);
@@ -1683,7 +1683,7 @@ SvStream& operator<<( SvStream& rOStrm, const Region& rRegion )
         PolyPolygon aNoCurvePolyPolygon;
         rRegion.GetAsPolyPolygon().AdaptiveSubdivide(aNoCurvePolyPolygon);
 
-        rOStrm << aNoCurvePolyPolygon;
+        WritePolyPolygon( rOStrm, aNoCurvePolyPolygon );
     }
 
     return rOStrm;
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 0dad0148f842..297d98b85353 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -152,7 +152,7 @@ SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
 
 // -----------------------------------------------------------------------
 
-SvStream& operator<<( SvStream& rOStm, const ImplWallpaper& rImplWallpaper )
+SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper )
 {
     VersionCompat   aCompat( rOStm, STREAM_WRITE, 3 );
     sal_Bool            bRect = ( rImplWallpaper.mpRect != NULL );
@@ -161,17 +161,17 @@ SvStream& operator<<( SvStream& rOStm, const ImplWallpaper& rImplWallpaper )
     sal_Bool            bDummy = sal_False;
 
     // version 1
-    rOStm << rImplWallpaper.maColor;
+    WriteColor( rOStm, rImplWallpaper.maColor );
     rOStm.WriteUInt16( (sal_uInt16) rImplWallpaper.meStyle );
 
     // version 2
     rOStm.WriteUChar( bRect ).WriteUChar( bGrad ).WriteUChar( bBmp ).WriteUChar( bDummy ).WriteUChar( bDummy ).WriteUChar( bDummy );
 
     if( bRect )
-        rOStm << *rImplWallpaper.mpRect;
+        WriteRectangle( rOStm, *rImplWallpaper.mpRect );
 
     if( bGrad )
-        rOStm << *rImplWallpaper.mpGradient;
+        WriteGradient( rOStm, *rImplWallpaper.mpGradient );
 
     if( bBmp )
         WriteDIBBitmapEx(*rImplWallpaper.mpBitmap, rOStm);
@@ -557,9 +557,9 @@ SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper )
 
 // -----------------------------------------------------------------------
 
-SvStream& operator<<( SvStream& rOStm, const Wallpaper& rWallpaper )
+SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper )
 {
-    return( rOStm << *rWallpaper.mpImplWallpaper );
+    return WriteImplWallpaper( rOStm, *rWallpaper.mpImplWallpaper );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */