Drop SvStream::WriteCharPtr

WriteOString is a better replacement

Change-Id: Ic431b9aeb98d19fe61cff71360eee555105cc2bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150192
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

3 files changed, 42 insertions, 42 deletions

diff --git a/svtools/source/svhtml/HtmlWriter.cxx b/svtools/source/svhtml/HtmlWriter.cxx
index 8f99e3b29110..3409461d363c 100644
--- a/svtools/source/svhtml/HtmlWriter.cxx
+++ b/svtools/source/svhtml/HtmlWriter.cxx
@@ -48,7 +48,7 @@ void HtmlWriter::start(const OString& aElement)
     {
         for(size_t i = 0; i < maElementStack.size() - 1; i++)
         {
-            mrStream.WriteCharPtr("  ");
+            mrStream.WriteOString("  ");
         }
     }
 
@@ -67,9 +67,9 @@ void HtmlWriter::endAttribute()
 {
     if (mbElementOpen)
     {
-        mrStream.WriteCharPtr("/>");
+        mrStream.WriteOString("/>");
         if (mbPrettyPrint)
-            mrStream.WriteCharPtr("\n");
+            mrStream.WriteOString("\n");
         mbElementOpen = false;
     }
 }
@@ -94,9 +94,9 @@ void HtmlWriter::end()
 {
     if (mbElementOpen && !mbCharactersWritten)
     {
-        mrStream.WriteCharPtr("/>");
+        mrStream.WriteOString("/>");
         if (mbPrettyPrint)
-            mrStream.WriteCharPtr("\n");
+            mrStream.WriteOString("\n");
     }
     else
     {
@@ -104,14 +104,14 @@ void HtmlWriter::end()
         {
             for(size_t i = 0; i < maElementStack.size() - 1; i++)
             {
-                mrStream.WriteCharPtr("  ");
+                mrStream.WriteOString("  ");
             }
         }
-        mrStream.WriteCharPtr("</");
+        mrStream.WriteOString("</");
         mrStream.WriteOString(Concat2View(maNamespace + maElementStack.back()));
-        mrStream.WriteCharPtr(">");
+        mrStream.WriteOString(">");
         if (mbPrettyPrint)
-            mrStream.WriteCharPtr("\n");
+            mrStream.WriteOString("\n");
     }
     maElementStack.pop_back();
     mbElementOpen = false;
@@ -168,7 +168,7 @@ void HtmlWriter::attribute(std::string_view aAttribute)
 void HtmlWriter::characters(std::string_view rChars)
 {
     if (!mbCharactersWritten)
-        mrStream.WriteCharPtr(">");
+        mrStream.WriteOString(">");
     mrStream.WriteOString(rChars);
     mbCharactersWritten = true;
 }
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index ca107cb0b016..1c2856050d0f 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -510,9 +510,9 @@ SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, std::string_view rStr,
                                       bool bOn )
 {
     if(bOn)
-        rStream.WriteCharPtr("<");
+        rStream.WriteOString("<");
     else
-        rStream.WriteCharPtr("</");
+        rStream.WriteOString("</");
 
     rStream.WriteOString(rStr).WriteChar('>');
 
@@ -565,19 +565,19 @@ SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uInt32 nHex, sal_uInt8 n
             *pStr += 39;
         nHex >>= 4;
     }
-    return rStream.WriteCharPtr( pStr );
+    return rStream.WriteOString( pStr );
 }
 
 
 SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor, bool bXHTML )
 {
-    rStream.WriteCharPtr( "\"" );
+    rStream.WriteOString( "\"" );
     if (bXHTML)
-        rStream.WriteCharPtr( "color: " );
-    rStream.WriteCharPtr( "#" );
+        rStream.WriteOString( "color: " );
+    rStream.WriteOString( "#" );
     if( rColor == COL_AUTO )
     {
-        rStream.WriteCharPtr( "000000" );
+        rStream.WriteOString( "000000" );
     }
     else
     {
@@ -614,7 +614,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
     rStream.WriteOString( sOut );
     sOut.setLength(0);
     Out_String( rStream, rOutName );
-    rStream.WriteCharPtr( "\">" );
+    rStream.WriteOString( "\">" );
 
     for( size_t i=0; i<rIMap.GetIMapObjectCount(); i++ )
     {
@@ -695,9 +695,9 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
             if( pShape )
             {
                 if( pDelim )
-                    rStream.WriteCharPtr( pDelim );
+                    rStream.WriteOString( pDelim );
                 if( pIndentArea )
-                    rStream.WriteCharPtr( pIndentArea );
+                    rStream.WriteOString( pIndentArea );
 
                 sOut.append(OString::Concat("<") + OOO_STRING_SVTOOLS_HTML_area
                         " " OOO_STRING_SVTOOLS_HTML_O_shape
@@ -718,7 +718,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
                     Out_String( rStream, aURL ).WriteChar( '\"' );
                 }
                 else
-                    rStream.WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_nohref );
+                    rStream.WriteOString( OOO_STRING_SVTOOLS_HTML_O_nohref );
 
                 const OUString& rObjName = pObj->GetName();
                 if( !rObjName.isEmpty() )
@@ -762,9 +762,9 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
     }
 
     if( pDelim )
-        rStream.WriteCharPtr( pDelim );
+        rStream.WriteOString( pDelim );
     if( pIndentMap )
-        rStream.WriteCharPtr( pIndentMap );
+        rStream.WriteOString( pIndentMap );
     Out_AsciiTag( rStream, OOO_STRING_SVTOOLS_HTML_map, false );
 
     return rStream;
@@ -825,12 +825,12 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
 
     if( !rSource.empty() || pSBLibrary || pSBModule )
     {
-        rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
+        rStrm.WriteOString( SAL_NEWLINE_STRING );
 
         if( JAVASCRIPT != eScriptType )
         {
-            rStrm.WriteCharPtr( "<!--" )
-                 .WriteCharPtr( SAL_NEWLINE_STRING );
+            rStrm.WriteOString( "<!--" )
+                 .WriteOString( SAL_NEWLINE_STRING );
         }
 
         if( STARBASIC == eScriptType )
@@ -839,7 +839,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
             {
                 sOut.append("' " OOO_STRING_SVTOOLS_HTML_SB_library " " +
                             OUStringToOString(*pSBLibrary, RTL_TEXTENCODING_UTF8));
-                rStrm.WriteOString( sOut ).WriteCharPtr( SAL_NEWLINE_STRING );
+                rStrm.WriteOString( sOut ).WriteOString( SAL_NEWLINE_STRING );
                 sOut.setLength(0);
             }
 
@@ -847,7 +847,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
             {
                 sOut.append("' " OOO_STRING_SVTOOLS_HTML_SB_module " " +
                         OUStringToOString(*pSBModule, RTL_TEXTENCODING_UTF8));
-                rStrm.WriteOString( sOut ).WriteCharPtr( SAL_NEWLINE_STRING );
+                rStrm.WriteOString( sOut ).WriteOString( SAL_NEWLINE_STRING );
                 sOut.setLength(0);
             }
         }
@@ -857,16 +857,16 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
             // we write the module in ANSI-charset, but with
             // the system new line.
             const OString sSource(OUStringToOString(rSource, RTL_TEXTENCODING_UTF8));
-            rStrm.WriteOString( sSource ).WriteCharPtr( SAL_NEWLINE_STRING );
+            rStrm.WriteOString( sSource ).WriteOString( SAL_NEWLINE_STRING );
         }
-        rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
+        rStrm.WriteOString( SAL_NEWLINE_STRING );
 
         if( JAVASCRIPT != eScriptType )
         {
             // MIB/MM: if it is not StarBasic, a // could be wrong.
             // As the comment is removed during reading, it is not helping us...
-            rStrm.WriteCharPtr( STARBASIC == eScriptType ? "' -->" : "// -->" )
-                 .WriteCharPtr( SAL_NEWLINE_STRING );
+            rStrm.WriteOString( STARBASIC == eScriptType ? "' -->" : "// -->" )
+                 .WriteOString( SAL_NEWLINE_STRING );
         }
     }
 
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index e66e66d840bb..4b4c35ae01a8 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -43,7 +43,7 @@ SvStream& Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen )
             *pStr += 39;
         nHex >>= 4;
     }
-    return rStream.WriteCharPtr( pStr );
+    return rStream.WriteOString( pStr );
 }
 
 // Ideally, this function should work on (sal_uInt32) Unicode scalar values
@@ -69,13 +69,13 @@ SvStream& Out_Char(SvStream& rStream, sal_Unicode c,
         // written
         break;
     case 0xA0:
-        rStream.WriteCharPtr( "\\~" );
+        rStream.WriteOString( "\\~" );
         break;
     case 0xAD:
-        rStream.WriteCharPtr( "\\-" );
+        rStream.WriteOString( "\\-" );
         break;
     case 0x2011:
-        rStream.WriteCharPtr( "\\_" );
+        rStream.WriteOString( "\\_" );
         break;
     case '\n':
         pStr = OOO_STRING_SVTOOLS_RTF_LINE;
@@ -150,17 +150,17 @@ SvStream& Out_Char(SvStream& rStream, sal_Unicode c,
                         {
                             // #i47831# add an additional whitespace, so that
                             // "document whitespaces" are not ignored.;
-                            rStream.WriteCharPtr( "\\uc" )
-                               .WriteOString( OString::number(nLen) ).WriteCharPtr( " " );
+                            rStream.WriteOString( "\\uc" )
+                               .WriteOString( OString::number(nLen) ).WriteOString( " " );
                             *pUCMode = nLen;
                         }
-                        rStream.WriteCharPtr( "\\u" )
+                        rStream.WriteOString( "\\u" )
                            .WriteInt32AsString(c);
                     }
 
                     for (sal_Int32 nI = 0; nI < nLen; ++nI)
                     {
-                        rStream.WriteCharPtr( "\\'" );
+                        rStream.WriteOString( "\\'" );
                         Out_Hex(rStream, sConverted[nI], 2);
                     }
                 }
@@ -170,7 +170,7 @@ SvStream& Out_Char(SvStream& rStream, sal_Unicode c,
     }
 
     if (pStr)
-        rStream.WriteCharPtr( pStr ).WriteChar( ' ' );
+        rStream.WriteOString( pStr ).WriteChar( ' ' );
 
     return rStream;
 }
@@ -184,7 +184,7 @@ SvStream& RTFOutFuncs::Out_String( SvStream& rStream, std::u16string_view rStr,
     for (size_t n = 0; n < rStr.size(); ++n)
         Out_Char(rStream, rStr[n], &nUCMode, eDestEnc);
     if (nUCMode != 1)
-      rStream.WriteCharPtr( "\\uc1" ).WriteCharPtr( " " ); // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.;
+      rStream.WriteOString( "\\uc1" ).WriteOString( " " ); // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.;
     return rStream;
 }