5 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index ac16dd2aa939..ccaf177f5140 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1885,7 +1885,7 @@ public:
                     OString aStr = OUStringToOString(it->getString(), RTL_TEXTENCODING_UTF8);
                     sal_Int32 nStrLength = aStr.getLength();
                     mrStrm.WriteInt32(nStrLength);
-                    mrStrm.WriteCharPtr(aStr.getStr());
+                    mrStrm.WriteOString(aStr);
                 }
             }
             break;
@@ -1914,7 +1914,7 @@ public:
                     }
                     mrStrm.WriteUInt64(nGroupLength);
                     mrStrm.WriteInt32(aFormula.getLength());
-                    mrStrm.WriteCharPtr(OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8).getStr());
+                    mrStrm.WriteOString(OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8));
 
                     // incrementing the iterator
                     std::advance(it, nGroupLength);
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 33101507df69..df24f8f0a219 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -415,7 +415,7 @@ void ScHTMLExport::WriteOverview()
             {
                 pDoc->GetName( nTab, aStr );
                 rStrm.WriteCharPtr( "<A HREF=\"#table" )
-                   .WriteCharPtr( OString::number(nTab).getStr() )
+                   .WriteOString( OString::number(nTab) )
                    .WriteCharPtr( "\">" );
                 OUT_STR( aStr );
                 rStrm.WriteCharPtr( "</A>" );
@@ -676,7 +676,7 @@ void ScHTMLExport::WriteTables()
 
                 // Write anchor
                 rStrm.WriteCharPtr( "<A NAME=\"table" )
-                   .WriteCharPtr( OString::number(nTab).getStr() )
+                   .WriteOString( OString::number(nTab) )
                    .WriteCharPtr( "\">" );
                 TAG_ON( OOO_STRING_SVTOOLS_HTML_head1 );
                 OUT_STR( aStrOut );
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 216d4f086591..e6959bfa35fe 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -217,7 +217,7 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf,
                     aBaseURL,
                     rLinkName ), eDestEnc ).WriteChar( '\"' );
         if ( !rImgOptions.isEmpty() )
-            rStrm.WriteCharPtr( rImgOptions.getStr() );
+            rStrm.WriteOString( rImgOptions );
         rStrm.WriteChar( '>' ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() );
     }
 }
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 109087229d47..3c9441764b36 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -95,7 +95,7 @@ void ScRTFExport::WriteTab( SCTAB nTab )
 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 ).WriteCharPtr( OString::number(pDoc->GetRowHeight(nRow, nTab)).getStr() );
+    rStrm.WriteCharPtr( 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++ )
@@ -126,7 +126,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
         if ( pChar )
             rStrm.WriteCharPtr( pChar );
 
-        rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteCharPtr( OString::number(pCellX[nCol+1]).getStr() );
+        rStrm.WriteCharPtr( 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
     }
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index e49c4d4a89f4..cc04c75b57f0 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -508,7 +508,7 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const OUString&
     else
     {
         OString aByteStr(OUStringToOString(rString, eEnc));
-        rStrm.WriteCharPtr( aByteStr.getStr() );
+        rStrm.WriteOString( aByteStr );
         if ( bZero )
             rStrm.WriteChar( 0 );
     }