convert more SvStream::operator<< calls

.. to more explicit SvStream::Write* calls
This was done using another run of the clang rewriter, and then
a lot of hand tweaking to fix all the places where the rewriter
did not play nice with various macros.

Change-Id: I7bcab93851c8dfb59cde6bc76290c6484d88fb18
Reviewed-on: https://gerrit.libreoffice.org/7494
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

4 files changed, 19 insertions, 19 deletions

diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 787e8175cca8..7b2b73f99a34 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -61,21 +61,21 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
                                      rtl_TextEncoding eDestEnc,
                                   OUString *pNonConvertableChars  )
 {
-    rStrm << SAL_NEWLINE_STRING;
+    rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
     if( pIndent )
-        rStrm << pIndent;
+        rStrm.WriteCharPtr( pIndent );
 
     OStringBuffer sOut;
     sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta).append(' ')
         .append(bHTTPEquiv ? OOO_STRING_SVTOOLS_HTML_O_httpequiv : OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
-    rStrm << sOut.makeStringAndClear().getStr();
+    rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
     HTMLOutFuncs::Out_String( rStrm, rName, eDestEnc, pNonConvertableChars );
 
     sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content).append("=\"");
-    rStrm << sOut.makeStringAndClear().getStr();
+    rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
-    HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars ) << "\">";
+    HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars ).WriteCharPtr( "\">" );
 }
 
 void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
@@ -96,9 +96,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
     }
 
     // Titel (auch wenn er leer ist)
-    rStrm << SAL_NEWLINE_STRING;
+    rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
     if( pIndent )
-        rStrm << pIndent;
+        rStrm.WriteCharPtr( pIndent );
     HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title );
     if( i_xDocProps.is() )
     {
@@ -114,16 +114,16 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
         const OUString& rTarget = i_xDocProps->getDefaultTarget();
         if( !rTarget.isEmpty() )
         {
-            rStrm << SAL_NEWLINE_STRING;
+            rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
             if( pIndent )
-                rStrm << pIndent;
+                rStrm.WriteCharPtr( pIndent );
 
             OStringBuffer sOut;
             sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_base).append(' ')
                 .append(OOO_STRING_SVTOOLS_HTML_O_target).append("=\"");
-            rStrm << sOut.makeStringAndClear().getStr();
+            rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
             HTMLOutFuncs::Out_String( rStrm, rTarget, eDestEnc, pNonConvertableChars )
-                << "\">";
+               .WriteCharPtr( "\">" );
         }
     }
 
@@ -256,7 +256,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
                     rBaseURL, aURL );
                 sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src)
                     .append("=\"");
-                rOut << sOut.makeStringAndClear().getStr();
+                rOut.WriteCharPtr( sOut.makeStringAndClear().getStr() );
                 HTMLOutFuncs::Out_String( rOut, aURL, eDestEnc, pNonConvertableChars );
                 sOut.append('\"');
             }
@@ -267,7 +267,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
                 .append("=\"");
-            rOut << sOut.makeStringAndClear().getStr();
+            rOut.WriteCharPtr( sOut.makeStringAndClear().getStr() );
             HTMLOutFuncs::Out_String( rOut, aStr, eDestEnc, pNonConvertableChars );
             sOut.append('\"');
         }
@@ -311,7 +311,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
                     .append('=').append(pStr);
             }
         }
-        rOut << sOut.getStr();
+        rOut.WriteCharPtr( sOut.getStr() );
     }
     catch (const uno::Exception&)
     {
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index 8205f1751f84..8fcc660e7618 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -78,7 +78,7 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
         pStrm = new SvMemoryStream( ( nEnd - nStt < 0x10000l
                                         ? nEnd - nStt + 32
                                         : 0 ));
-        *pStrm << rStream;
+        pStrm->WriteStream( rStream );
         pStrm->SetStreamSize( nEnd - nStt + 1L );
         pStrm->Seek( STREAM_SEEK_TO_BEGIN );
         return pStrm;
@@ -91,7 +91,7 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
         {
             rStream.Seek(nFragStart);
             pStrm = new SvMemoryStream(nSize);
-            *pStrm << rStream;
+            pStrm->WriteStream( rStream );
             pStrm->SetStreamSize(nSize);
             pStrm->Seek(STREAM_SEEK_TO_BEGIN);
             return pStrm;
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index c0c05b0ee106..9ad03eb34e04 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -244,7 +244,7 @@ sal_Bool SfxHTMLParser::FinishFileDownload( OUString& rStr )
 
         SvMemoryStream aStream;
         if( pStream )
-            aStream << *pStream;
+            aStream.WriteStream( *pStream );
 
         aStream.Seek( STREAM_SEEK_TO_END );
         sal_Size nLen = aStream.Tell();
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index b95293dd7c05..1c6745ebbfa0 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -470,7 +470,7 @@ void SfxOleDoubleProperty::ImplLoad( SvStream& rStrm )
 
 void SfxOleDoubleProperty::ImplSave( SvStream& rStrm )
 {
-    rStrm << mfValue;
+    rStrm.WriteDouble( mfValue );
 }
 
 // ----------------------------------------------------------------------------
@@ -640,7 +640,7 @@ void SfxOleDateProperty::ImplSave( SvStream& rStrm )
     //number of days (not seconds) since December 31, 1899
     long nStartDays = ::Date::DateToDays(31, 12, 1899);
     double fValue = nDays-nStartDays;
-    rStrm << fValue;
+    rStrm.WriteDouble( fValue );
 }
 
 // ----------------------------------------------------------------------------