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

6 files changed, 9 insertions, 9 deletions

diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index d7e38dc3e939..8a68903bb3e1 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -86,7 +86,7 @@ public:
     const OUString          GetTitle() const;
     void                    SetTitle( const OUString& rTitle );
 
-    friend SvStream&        operator<<( SvStream& rOut, const SgaObject& rObj );
+    friend SvStream&        WriteSgaObject( SvStream& rOut, const SgaObject& rObj );
     friend SvStream&        operator>>( SvStream& rIn, SgaObject& rObj );
 
     BitmapEx createPreviewBitmapEx(const Size& rSizePixel) const;
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 09bf8b40384b..2f078021059a 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -188,7 +188,7 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const
         rOut.SetCompressMode( nOldCompressMode );
     }
     else
-        rOut << aThumbMtf;
+        WriteGDIMetaFile( rOut, aThumbMtf );
 
     OUString aURLWithoutDestDir = aURL.GetMainURL( INetURLObject::NO_DECODE );
     aURLWithoutDestDir = aURLWithoutDestDir.replaceFirst(rDestDir, "");
@@ -252,7 +252,7 @@ void SgaObject::SetTitle( const OUString& rTitle )
     aTitle = rTitle;
 }
 
-SvStream& operator<<( SvStream& rOut, const SgaObject& rObj )
+SvStream& WriteSgaObject( SvStream& rOut, const SgaObject& rObj )
 {
     rObj.WriteData( rOut, "" );
     return rOut;
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 8a4534d84128..8d4f6fb4c704 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -207,7 +207,7 @@ void GalleryTheme::ImplWrite()
 
             if( pOStm )
             {
-                *pOStm << *this;
+                WriteGalleryTheme( *pOStm, *this );
                 delete pOStm;
             }
 
@@ -646,7 +646,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
                     pIStm->Seek( pEntry->nOffset );
                     *pIStm >> *pObj;
                     pEntry->nOffset = pTmpStm->Tell();
-                    *pTmpStm << *pObj;
+                    WriteSgaObject( *pTmpStm, *pObj );
                     delete pObj;
                 }
             }
@@ -1512,7 +1512,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
     return rIStm;
 }
 
-SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme )
+SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme )
 {
     return rTheme.WriteData( rOut );
 }
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 959123536811..da6c87b180e5 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -84,7 +84,7 @@ sal_Bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::Da
 
 sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, sal_uInt32 , const ::com::sun::star::datatransfer::DataFlavor&  )
 {
-    *rxOStm << maData;
+    WriteXFillExchangeData( *rxOStm, maData );
     return( rxOStm->GetError() == ERRCODE_NONE );
 }
 
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 4bbb8008c9ce..cdd7dac5e5a3 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -320,7 +320,7 @@ SvStream& XColorItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 
     if ( !IsIndex() )
     {
-        rOut << aColor;
+        WriteColor( rOut, aColor );
     }
 
     return rOut;
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index c5c67763a0cc..54ef1f447b75 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -49,7 +49,7 @@ XFillExchangeData::~XFillExchangeData()
 }
 
 /// binary export (currently w/o version control because it is not persistent)
-SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
+SvStream& WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rData )
 {
     if( rData.pXFillAttrSetItem )
     {