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

4 files changed, 14 insertions, 13 deletions

diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 8fbfe9bb8183..55790e9fe15a 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -307,7 +307,7 @@ void ODbaseIndex::Release(sal_Bool bSave)
     {
         m_aHeader.db_rootpage = m_nRootPage;
         m_aHeader.db_pagecount = m_nPageCount;
-        (*m_pFileStream) << *this;
+        WriteODbaseIndex( *m_pFileStream, *this );
     }
     m_nRootPage = m_nPageCount = 0;
     m_nCurNode = NODE_NOTFOUND;
@@ -356,7 +356,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ODbaseIndex& rInd
     return rStream;
 }
 //------------------------------------------------------------------
-SvStream& connectivity::dbase::operator << (SvStream &rStream, ODbaseIndex& rIndex)
+SvStream& connectivity::dbase::WriteODbaseIndex(SvStream &rStream, ODbaseIndex& rIndex)
 {
     rStream.Seek(0);
     OSL_VERIFY_EQUALS( rStream.Write(&rIndex.m_aHeader,DINDEX_PAGE_SIZE), DINDEX_PAGE_SIZE, "Write not successful: Wrong header size for dbase index!");
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 3341af9dae54..cfa06db4614b 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -90,7 +90,7 @@ void ONDXPage::QueryDelete()
 {
     // Store in GarbageCollector
     if (IsModified() && rIndex.m_pFileStream)
-        (*rIndex.m_pFileStream) << *this;
+        WriteONDXPage( *rIndex.m_pFileStream, *this );
 
     bModified = sal_False;
     if (rIndex.UseCollector())
@@ -713,7 +713,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
         }
         rStream.Write(&pBuf[0], nLen);
     }
-    rStream << aChild;
+    WriteONDXPagePtr( rStream, aChild );
 }
 
 
@@ -791,7 +791,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPagePtr& rPag
     return rStream;
 }
 // -----------------------------------------------------------------------------
-SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPagePtr& rPage)
+SvStream& connectivity::dbase::WriteONDXPagePtr(SvStream &rStream, const ONDXPagePtr& rPage)
 {
     rStream.WriteUInt32( rPage.nPagePos );
     return rStream;
@@ -845,7 +845,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 }
 
 //------------------------------------------------------------------
-SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
+SvStream& connectivity::dbase::WriteONDXPage(SvStream &rStream, const ONDXPage& rPage)
 {
     // Page doesn't exist yet
     sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * DINDEX_PAGE_SIZE;
@@ -862,7 +862,8 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
     OSL_UNUSED( nCurrentPos );
 
     nValue = rPage.nCount;
-    rStream.WriteUInt32( nValue ) << rPage.aChild;
+    rStream.WriteUInt32( nValue );
+    WriteONDXPagePtr( rStream, rPage.aChild );
 
     sal_uInt16 i = 0;
     for (; i < rPage.nCount; i++)
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 7a0bb52dc749..19da5d5fce11 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -40,7 +40,7 @@ namespace connectivity
 
         class ODbaseIndex : public ODbaseIndex_BASE
         {
-            friend SvStream& operator << (SvStream &rStream, ODbaseIndex&);
+            friend SvStream& WriteODbaseIndex(SvStream &rStream, ODbaseIndex&);
             friend SvStream& operator >> (SvStream &rStream, ODbaseIndex&);
 
             friend class ONDXNode;
@@ -141,7 +141,7 @@ namespace connectivity
             sal_Bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
         };
 
-        SvStream& operator << (SvStream &rStream, ODbaseIndex&);
+        SvStream& WriteODbaseIndex(SvStream &rStream, ODbaseIndex&);
         SvStream& operator >> (SvStream &rStream, ODbaseIndex&);
     }
 }
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 81a831540b02..a6b0086c01b5 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -91,7 +91,7 @@ namespace connectivity
 
         class ONDXPagePtr : public ONDXPageRef
         {
-            friend  SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
+            friend  SvStream& WriteONDXPagePtr(SvStream &rStream, const ONDXPagePtr&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
 
             sal_uInt32  nPagePos;       // Position in the index file
@@ -115,7 +115,7 @@ namespace connectivity
         {
             friend class ODbaseIndex;
 
-            friend  SvStream& operator << (SvStream &rStream, const ONDXPage&);
+            friend  SvStream& WriteONDXPage(SvStream &rStream, const ONDXPage&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPage&);
 
             sal_uInt32      nPagePos;       // Position in the index file
@@ -190,7 +190,7 @@ namespace connectivity
 
         SV_IMPL_REF(ONDXPage);
 
-        SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
+        SvStream& WriteONDXPagePtr(SvStream &rStream, const ONDXPagePtr&);
         SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
 
         inline sal_Bool ONDXPage::IsRoot() const {return !aParent.Is();}
@@ -212,7 +212,7 @@ namespace connectivity
                 aChild->SetParent(this);
         }
         SvStream& operator >> (SvStream &rStream, ONDXPage& rPage);
-        SvStream& operator << (SvStream &rStream, const ONDXPage& rPage);
+        SvStream& WriteONDXPage(SvStream &rStream, const ONDXPage& rPage);
 
 
         typedef ::std::vector<ONDXPage*>    ONDXPageList;