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, 118 insertions, 118 deletions

diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index f9bcd4e3e0bb..aa48b3c598a0 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -116,15 +116,15 @@ const char ScHTMLExport::sIndentSource[nIndentMax+1] =
 #define TAG_ON( tag )       HTMLOutFuncs::Out_AsciiTag( rStrm, tag )
 #define TAG_OFF( tag )      HTMLOutFuncs::Out_AsciiTag( rStrm, tag, false )
 #define OUT_STR( str )      HTMLOutFuncs::Out_String( rStrm, str, &aNonConvertibleChars )
-#define OUT_LF()            rStrm.WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() )
-#define TAG_ON_LF( tag )    (TAG_ON( tag ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() ))
-#define TAG_OFF_LF( tag )   (TAG_OFF( tag ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() ))
+#define OUT_LF()            rStrm.WriteOString( SAL_NEWLINE_STRING ).WriteOString( GetIndentStr() )
+#define TAG_ON_LF( tag )    (TAG_ON( tag ).WriteOString( SAL_NEWLINE_STRING ).WriteOString( GetIndentStr() ))
+#define TAG_OFF_LF( tag )   (TAG_OFF( tag ).WriteOString( SAL_NEWLINE_STRING ).WriteOString( GetIndentStr() ))
 #define OUT_HR()            TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule )
-#define OUT_COMMENT( comment )  (rStrm.WriteCharPtr( sMyBegComment ), OUT_STR( comment ) \
-                                .WriteCharPtr( sMyEndComment ).WriteCharPtr( SAL_NEWLINE_STRING ) \
-                                .WriteCharPtr( GetIndentStr() ))
+#define OUT_COMMENT( comment )  (rStrm.WriteOString( sMyBegComment ), OUT_STR( comment ) \
+                                .WriteOString( sMyEndComment ).WriteOString( SAL_NEWLINE_STRING ) \
+                                .WriteOString( GetIndentStr() ))
 
-#define OUT_SP_CSTR_ASS( s )    rStrm.WriteChar( ' ').WriteCharPtr( s ).WriteChar( '=' )
+#define OUT_SP_CSTR_ASS( s )    rStrm.WriteChar(' ').WriteOString( s ).WriteChar( '=' )
 
 #define GLOBSTR(id) ScResId( id )
 
@@ -296,8 +296,8 @@ void ScHTMLExport::Write()
 {
     if (!mbSkipHeaderFooter)
     {
-        rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype5 ).WriteChar( '>' )
-           .WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( SAL_NEWLINE_STRING );
+        rStrm.WriteChar( '<' ).WriteOString( OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteOString( OOO_STRING_SVTOOLS_HTML_doctype5 ).WriteChar( '>' )
+           .WriteOString( SAL_NEWLINE_STRING ).WriteOString( SAL_NEWLINE_STRING );
         TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html );
         WriteHeader();
         OUT_LF();
@@ -341,30 +341,30 @@ void ScHTMLExport::WriteHeader()
     // CSS1 StyleSheet
     PageDefaults( bAll ? 0 : aRange.aStart.Tab() );
     IncIndent(1);
-    rStrm.WriteCharPtr( "<" ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_style ).WriteCharPtr( " " ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_type ).WriteCharPtr( "=\"text/css\">" );
+    rStrm.WriteOString( "<" ).WriteOString( OOO_STRING_SVTOOLS_HTML_style ).WriteOString( " " ).WriteOString( OOO_STRING_SVTOOLS_HTML_O_type ).WriteOString( "=\"text/css\">" );
 
     OUT_LF();
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_body);
-    rStrm.WriteCharPtr(",");
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_division);
-    rStrm.WriteCharPtr(",");
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_table);
-    rStrm.WriteCharPtr(",");
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_thead);
-    rStrm.WriteCharPtr(",");
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_tbody);
-    rStrm.WriteCharPtr(",");
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_tfoot);
-    rStrm.WriteCharPtr(",");
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_tablerow);
-    rStrm.WriteCharPtr(",");
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_tableheader);
-    rStrm.WriteCharPtr(",");
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_tabledata);
-    rStrm.WriteCharPtr(",");
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_parabreak);
-    rStrm.WriteCharPtr(" { ");
-    rStrm.WriteCharPtr("font-family:");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_body);
+    rStrm.WriteOString(",");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_division);
+    rStrm.WriteOString(",");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_table);
+    rStrm.WriteOString(",");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_thead);
+    rStrm.WriteOString(",");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_tbody);
+    rStrm.WriteOString(",");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_tfoot);
+    rStrm.WriteOString(",");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_tablerow);
+    rStrm.WriteOString(",");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_tableheader);
+    rStrm.WriteOString(",");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_tabledata);
+    rStrm.WriteOString(",");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_parabreak);
+    rStrm.WriteOString(" { ");
+    rStrm.WriteOString("font-family:");
 
     if (!aHTMLStyle.aFontFamilyName.isEmpty())
     {
@@ -376,70 +376,70 @@ void ScHTMLExport::WriteHeader()
             rStrm.WriteChar( '\"' );
             if (nPos<0)
                 break;
-            rStrm.WriteCharPtr( ", " );
+            rStrm.WriteOString( ", " );
         }
     }
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr("font-size:");
-    rStrm.WriteCharPtr(GetFontSizeCss(static_cast<sal_uInt16>(aHTMLStyle.nFontHeight)));
-    rStrm.WriteCharPtr(" }");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString("font-size:");
+    rStrm.WriteOString(GetFontSizeCss(static_cast<sal_uInt16>(aHTMLStyle.nFontHeight)));
+    rStrm.WriteOString(" }");
 
     OUT_LF();
 
     // write the style for the comments to make them stand out from normal cell content
     // this is done through only showing the cell contents when the custom indicator is hovered
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_anchor);
-    rStrm.WriteCharPtr(".comment-indicator:hover");
-    rStrm.WriteCharPtr(" + ");
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_comment2);
-    rStrm.WriteCharPtr(" { ");
-    rStrm.WriteCharPtr(sBackground);
-    rStrm.WriteCharPtr("#ffd");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr("position:");
-    rStrm.WriteCharPtr("absolute");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr(sDisplay);
-    rStrm.WriteCharPtr("block");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr(sBorder);
-    rStrm.WriteCharPtr("1px solid black");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr("padding:");
-    rStrm.WriteCharPtr("0.5em");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr(" } ");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_anchor);
+    rStrm.WriteOString(".comment-indicator:hover");
+    rStrm.WriteOString(" + ");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_comment2);
+    rStrm.WriteOString(" { ");
+    rStrm.WriteOString(sBackground);
+    rStrm.WriteOString("#ffd");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString("position:");
+    rStrm.WriteOString("absolute");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString(sDisplay);
+    rStrm.WriteOString("block");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString(sBorder);
+    rStrm.WriteOString("1px solid black");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString("padding:");
+    rStrm.WriteOString("0.5em");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString(" } ");
 
     OUT_LF();
 
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_anchor);
-    rStrm.WriteCharPtr(".comment-indicator");
-    rStrm.WriteCharPtr(" { ");
-    rStrm.WriteCharPtr(sBackground);
-    rStrm.WriteCharPtr("red");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr(sDisplay);
-    rStrm.WriteCharPtr("inline-block");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr(sBorder);
-    rStrm.WriteCharPtr("1px solid black");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr("width:");
-    rStrm.WriteCharPtr("0.5em");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr("height:");
-    rStrm.WriteCharPtr("0.5em");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr(" } ");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_anchor);
+    rStrm.WriteOString(".comment-indicator");
+    rStrm.WriteOString(" { ");
+    rStrm.WriteOString(sBackground);
+    rStrm.WriteOString("red");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString(sDisplay);
+    rStrm.WriteOString("inline-block");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString(sBorder);
+    rStrm.WriteOString("1px solid black");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString("width:");
+    rStrm.WriteOString("0.5em");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString("height:");
+    rStrm.WriteOString("0.5em");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString(" } ");
 
     OUT_LF();
 
-    rStrm.WriteCharPtr(OOO_STRING_SVTOOLS_HTML_comment2);
-    rStrm.WriteCharPtr(" { ");
-    rStrm.WriteCharPtr(sDisplay);
-    rStrm.WriteCharPtr("none");
-    rStrm.WriteCharPtr("; ");
-    rStrm.WriteCharPtr(" } ");
+    rStrm.WriteOString(OOO_STRING_SVTOOLS_HTML_comment2);
+    rStrm.WriteOString(" { ");
+    rStrm.WriteOString(sDisplay);
+    rStrm.WriteOString("none");
+    rStrm.WriteOString("; ");
+    rStrm.WriteOString(" } ");
 
 
     IncIndent(-1);
@@ -471,11 +471,11 @@ void ScHTMLExport::WriteOverview()
         if ( !IsEmptyTable( nTab ) )
         {
             pDoc->GetName( nTab, aStr );
-            rStrm.WriteCharPtr( "<A HREF=\"#table" )
+            rStrm.WriteOString( "<A HREF=\"#table" )
                .WriteOString( OString::number(nTab) )
-               .WriteCharPtr( "\">" );
+               .WriteOString( "\">" );
             OUT_STR( aStr );
-            rStrm.WriteCharPtr( "</A>" );
+            rStrm.WriteOString( "</A>" );
             TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_linebreak );
         }
     }
@@ -608,7 +608,7 @@ void ScHTMLExport::WriteBody()
     // default text color black
     if (!mbSkipHeaderFooter)
     {
-        rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body );
+        rStrm.WriteChar( '<' ).WriteOString( OOO_STRING_SVTOOLS_HTML_body );
 
         if (!mbSkipImages)
         {
@@ -651,7 +651,7 @@ void ScHTMLExport::WriteBody()
                 }
                 if( !aLink.isEmpty() )
                 {
-                    rStrm.WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_background ).WriteCharPtr( "=\"" );
+                    rStrm.WriteChar( ' ' ).WriteOString( OOO_STRING_SVTOOLS_HTML_O_background ).WriteOString( "=\"" );
                     OUT_STR( URIHelper::simpleNormalizedMakeRelative(
                                 aBaseURL,
                                 aLink ) ).WriteChar( '\"' );
@@ -728,9 +728,9 @@ void ScHTMLExport::WriteTables()
                 OUT_HR();
 
                 // Write anchor
-                rStrm.WriteCharPtr( "<A NAME=\"table" )
+                rStrm.WriteOString( "<A NAME=\"table" )
                    .WriteOString( OString::number(nTab) )
-                   .WriteCharPtr( "\">" );
+                   .WriteOString( "\">" );
                 TAG_ON( OOO_STRING_SVTOOLS_HTML_head1 );
                 OUT_STR( aStrOut );
                 TAG_ON( OOO_STRING_SVTOOLS_HTML_emphasis );
@@ -740,7 +740,7 @@ void ScHTMLExport::WriteTables()
 
                 TAG_OFF( OOO_STRING_SVTOOLS_HTML_emphasis );
                 TAG_OFF( OOO_STRING_SVTOOLS_HTML_head1 );
-                rStrm.WriteCharPtr( "</A>" ); OUT_LF();
+                rStrm.WriteOString( "</A>" ); OUT_LF();
             }
         }
         else
@@ -1293,11 +1293,11 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData )
                         if (const SvxURLField* pURLField = dynamic_cast<const SvxURLField*>(pField))
                         {
                             bUrl = true;
-                            rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_anchor ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_href ).WriteCharPtr( "=\"" );
+                            rStrm.WriteChar( '<' ).WriteOString( OOO_STRING_SVTOOLS_HTML_anchor ).WriteChar( ' ' ).WriteOString( OOO_STRING_SVTOOLS_HTML_O_href ).WriteOString( "=\"" );
                             OUT_STR( pURLField->GetURL() );
-                            rStrm.WriteCharPtr( "\">" );
+                            rStrm.WriteOString( "\">" );
                             OUT_STR( pURLField->GetRepresentation() );
-                            rStrm.WriteCharPtr( "</" ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_anchor ).WriteChar( '>' );
+                            rStrm.WriteOString( "</" ).WriteOString( OOO_STRING_SVTOOLS_HTML_anchor ).WriteChar( '>' );
                         }
                     }
                 }
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 5189ec92aafd..165dc1be06db 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -210,13 +210,13 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf,
     // <IMG SRC="..."[ rImgOptions]>
     if( !rLinkName.isEmpty() )
     {
-        rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_image ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_src ).WriteCharPtr( "=\"" );
+        rStrm.WriteChar( '<' ).WriteOString( OOO_STRING_SVTOOLS_HTML_image ).WriteChar( ' ' ).WriteOString( OOO_STRING_SVTOOLS_HTML_O_src ).WriteOString( "=\"" );
         HTMLOutFuncs::Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(
                     aBaseURL,
                     rLinkName ) ).WriteChar( '\"' );
         if ( !rImgOptions.empty() )
             rStrm.WriteOString( rImgOptions );
-        rStrm.WriteChar( '>' ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() );
+        rStrm.WriteChar( '>' ).WriteOString( SAL_NEWLINE_STRING ).WriteOString( GetIndentStr() );
     }
 }
 
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 7129049475e6..32549cbff377 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -56,23 +56,23 @@ ScRTFExport::~ScRTFExport()
 
 void ScRTFExport::Write()
 {
-    rStrm.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF );
-    rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING );
+    rStrm.WriteChar( '{' ).WriteOString( OOO_STRING_SVTOOLS_RTF_RTF );
+    rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteOString( SAL_NEWLINE_STRING );
 
     // Data
     for ( SCTAB nTab = aRange.aStart.Tab(); nTab <= aRange.aEnd.Tab(); nTab++ )
     {
         if ( nTab > aRange.aStart.Tab() )
-            rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAR );
+            rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_PAR );
         WriteTab( nTab );
     }
 
-    rStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
+    rStrm.WriteChar( '}' ).WriteOString( SAL_NEWLINE_STRING );
 }
 
 void ScRTFExport::WriteTab( SCTAB nTab )
 {
-    rStrm.WriteChar( '{' ).WriteCharPtr( SAL_NEWLINE_STRING );
+    rStrm.WriteChar( '{' ).WriteOString( SAL_NEWLINE_STRING );
     if ( pDoc->HasTable( nTab ) )
     {
         memset( &pCellX[0], 0, (pDoc->MaxCol()+2) * sizeof(sal_uLong) );
@@ -89,13 +89,13 @@ void ScRTFExport::WriteTab( SCTAB nTab )
             WriteRow( nTab, nRow );
         }
     }
-    rStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
+    rStrm.WriteChar( '}' ).WriteOString( SAL_NEWLINE_STRING );
 }
 
 void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
 {
-    rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH ).WriteCharPtr( "30" ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRLEFT ).WriteCharPtr( "-30" );
-    rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRRH ).WriteOString( OString::number(pDoc->GetRowHeight(nRow, nTab)) );
+    rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteOString( OOO_STRING_SVTOOLS_RTF_TRGAPH ).WriteOString( "30" ).WriteOString( OOO_STRING_SVTOOLS_RTF_TRLEFT ).WriteOString( "-30" );
+    rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_TRRH ).WriteOString( OString::number(pDoc->GetRowHeight(nRow, nTab)) );
     SCCOL nCol;
     SCCOL nEndCol = aRange.aEnd.Col();
     for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
@@ -107,12 +107,12 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
         const char* pChar;
 
         if ( rMergeAttr.GetColMerge() != 0 )
-            rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CLMGF );
+            rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_CLMGF );
         else
         {
             const ScMergeFlagAttr& rMergeFlagAttr = pAttr->GetItem( ATTR_MERGE_FLAG );
             if ( rMergeFlagAttr.IsHorOverlapped() )
-                rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CLMRG );
+                rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_CLMRG );
         }
 
         switch( rVerJustifyItem.GetValue() )
@@ -124,13 +124,13 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
             default:                           pChar = nullptr;           break;
         }
         if ( pChar )
-            rStrm.WriteCharPtr( pChar );
+            rStrm.WriteOString( pChar );
 
-        rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteOString( OString::number(pCellX[nCol+1]) );
+        rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteOString( OString::number(pCellX[nCol+1]) );
         if ( (nCol & 0x0F) == 0x0F )
-            rStrm.WriteCharPtr( SAL_NEWLINE_STRING ); // Do not let lines get too long
+            rStrm.WriteOString( SAL_NEWLINE_STRING ); // Do not let lines get too long
     }
-    rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL ).WriteCharPtr( SAL_NEWLINE_STRING );
+    rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_PARD ).WriteOString( OOO_STRING_SVTOOLS_RTF_PLAIN ).WriteOString( OOO_STRING_SVTOOLS_RTF_INTBL ).WriteOString( SAL_NEWLINE_STRING );
 
     sal_uInt64 nStrmPos = rStrm.Tell();
     for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
@@ -138,11 +138,11 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
         WriteCell( nTab, nRow, nCol );
         if ( rStrm.Tell() - nStrmPos > 255 )
         {   // Do not let lines get too long
-            rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
+            rStrm.WriteOString( SAL_NEWLINE_STRING );
             nStrmPos = rStrm.Tell();
         }
     }
-    rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW ).WriteCharPtr( SAL_NEWLINE_STRING );
+    rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_ROW ).WriteOString( SAL_NEWLINE_STRING );
 }
 
 void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
@@ -152,7 +152,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
     const ScMergeFlagAttr& rMergeFlagAttr = pAttr->GetItem( ATTR_MERGE_FLAG );
     if ( rMergeFlagAttr.IsHorOverlapped() )
     {
-        rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL );
+        rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_CELL );
         return ;
     }
 
@@ -204,30 +204,30 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
         case SvxCellHorJustify::Repeat:
         default:                        pChar = OOO_STRING_SVTOOLS_RTF_QL;  break;
     }
-    rStrm.WriteCharPtr( pChar );
+    rStrm.WriteOString( pChar );
 
     if ( rWeightItem.GetWeight() >= WEIGHT_BOLD )
     {   // bold
         bResetAttr = true;
-        rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B );
+        rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_B );
     }
     if ( rPostureItem.GetPosture() != ITALIC_NONE )
     {   // italic
         bResetAttr = true;
-        rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I );
+        rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_I );
     }
     if ( rUnderlineItem.GetLineStyle() != LINESTYLE_NONE )
     {   // underline
         bResetAttr = true;
-        rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL );
+        rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_UL );
     }
 
     rStrm.WriteChar( ' ' );
     RTFOutFuncs::Out_String( rStrm, aContent );
-    rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL );
+    rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_CELL );
 
     if ( bResetAttr )
-        rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN );
+        rStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_PLAIN );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */