diff options
37 files changed, 181 insertions, 181 deletions
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 01ba74852f3d..2af16a5a712e 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -967,7 +967,7 @@ static bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, // without any length information! without end-identifier! // What does that mean for Unicode?! Choosing conversion to ByteString... OString aByteStr(OUStringToOString(rStr, osl_getThreadTextEncoding())); - pStrm->WriteCharPtr( aByteStr.getStr() ); + pStrm->WriteOString( aByteStr ); } } break; diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index c3810feb0ebc..f9ad3b24f816 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -696,17 +696,17 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US)); rStrm.WriteCharPtr( "Object( " ) - .WriteCharPtr( OString::number(reinterpret_cast<sal_Int64>(this)).getStr() ).WriteCharPtr( "=='" ) + .WriteOString( OString::number(reinterpret_cast<sal_Int64>(this)) ).WriteCharPtr( "=='" ) .WriteCharPtr( aNameStr.isEmpty() ? "<unnamed>" : aNameStr.getStr() ).WriteCharPtr( "', " ) - .WriteCharPtr( "of class '" ).WriteCharPtr( aClassNameStr.getStr() ).WriteCharPtr( "', " ) + .WriteCharPtr( "of class '" ).WriteOString( aClassNameStr ).WriteCharPtr( "', " ) .WriteCharPtr( "counts " ) - .WriteCharPtr( OString::number(GetRefCount()).getStr() ) + .WriteOString( OString::number(GetRefCount()) ) .WriteCharPtr( " refs, " ); if ( GetParent() ) { OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); rStrm.WriteCharPtr( "in parent " ) - .WriteCharPtr( OString::number(reinterpret_cast<sal_Int64>(GetParent())).getStr() ) + .WriteOString( OString::number(reinterpret_cast<sal_Int64>(GetParent())) ) .WriteCharPtr( "=='" ).WriteCharPtr( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr.getStr() ).WriteCharPtr( "'" ); } else @@ -715,18 +715,18 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) } rStrm.WriteCharPtr( " )" ) << endl; OString aIndentNameStr(OUStringToOString(aIndent, RTL_TEXTENCODING_ASCII_US)); - rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "{" ) << endl; + rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "{" ) << endl; // Flags OUString aAttrs; if( CollectAttrs( this, aAttrs ) ) { OString aAttrStr(OUStringToOString(aAttrs, RTL_TEXTENCODING_ASCII_US)); - rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Flags: " ).WriteCharPtr( aAttrStr.getStr() ) << endl; + rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "- Flags: " ).WriteOString( aAttrStr ) << endl; } // Methods - rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Methods:" ) << endl; + rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "- Methods:" ) << endl; for( sal_uInt16 i = 0; i < pMethods->Count(); i++ ) { SbxVariableRef& r = pMethods->GetRef( i ); @@ -762,7 +762,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) } // Properties - rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Properties:" ) << endl; + rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "- Properties:" ) << endl; { for( sal_uInt16 i = 0; i < pProps->Count(); i++ ) { @@ -800,7 +800,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) } // Objects - rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Objects:" ) << endl; + rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "- Objects:" ) << endl; { for( sal_uInt16 i = 0; i < pObjs->Count(); i++ ) { @@ -808,7 +808,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) SbxVariable* pVar = r.get(); if ( pVar ) { - rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( " - Sub" ); + rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( " - Sub" ); if (SbxObject *pSbxObj = dynamic_cast<SbxObject*>(pVar)) { pSbxObj->Dump(rStrm, bFill); @@ -821,7 +821,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) } } - rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "}" ) << endl << endl; + rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "}" ) << endl << endl; --nLevel; } diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index bab30af36989..85aa19816af0 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -621,12 +621,12 @@ void SbxVariable::Dump( SvStream& rStrm, bool bFill ) { OString aBNameStr(OUStringToOString(GetName( SbxNameType::ShortTypes ), RTL_TEXTENCODING_ASCII_US)); rStrm.WriteCharPtr( "Variable( " ) - .WriteCharPtr( OString::number(reinterpret_cast<sal_Int64>(this)).getStr() ).WriteCharPtr( "==" ) - .WriteCharPtr( aBNameStr.getStr() ); + .WriteOString( OString::number(reinterpret_cast<sal_Int64>(this)) ).WriteCharPtr( "==" ) + .WriteOString( aBNameStr ); OString aBParentNameStr(OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US)); if ( GetParent() ) { - rStrm.WriteCharPtr( " in parent '" ).WriteCharPtr( aBParentNameStr.getStr() ).WriteCharPtr( "'" ); + rStrm.WriteCharPtr( " in parent '" ).WriteOString( aBParentNameStr ).WriteCharPtr( "'" ); } else { diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 3f91c546fb2d..c6c6626a4965 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1212,7 +1212,7 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo) throwInvalidColumnType( STR_INVALID_COLUMN_NAME_LENGTH, aName ); } - m_pFileStream->WriteCharPtr( aCol.getStr() ); + m_pFileStream->WriteOString( aCol ); m_pFileStream->WriteBytes(aBuffer, 11 - aCol.getLength()); sal_Int32 nPrecision = 0; diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index fb82d00d1e77..d134f3207d09 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -354,7 +354,7 @@ bool ORTFImportExport::Write() m_pStream->WriteCharPtr( "\\f" ); m_pStream->WriteInt32AsString(++nTok); m_pStream->WriteCharPtr( "\\fcharset0\\fnil " ); - m_pStream->WriteCharPtr( aFonts.getToken(0, ';', nIdx).getStr() ); + m_pStream->WriteOString( aFonts.getToken(0, ';', nIdx) ); m_pStream->WriteChar( ';' ); } while (nIdx>=0); } @@ -522,7 +522,7 @@ void ORTFImportExport::appendRow(OString const * pHorzChar,sal_Int32 _nColumnCou { m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); m_pStream->WriteChar( '{' ); - m_pStream->WriteCharPtr( pHorzChar[i-1].getStr() ); + m_pStream->WriteOString( pHorzChar[i-1] ); if ( bBold ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B ); if ( bItalic ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I ); @@ -659,7 +659,7 @@ void OHTMLImportExport::WriteBody() m_pStream->WriteCharPtr( "<" ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_style ).WriteCharPtr( " " ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_type ).WriteCharPtr( "=\"text/css\">" ); m_pStream->WriteCharPtr( "<!-- " ); OUT_LF(); - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body ).WriteCharPtr( " { " ).WriteCharPtr( "font-family: " ).WriteChar( '"' ).WriteCharPtr( OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()).getStr() ).WriteChar( '\"' ); + m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body ).WriteCharPtr( " { " ).WriteCharPtr( "font-family: " ).WriteChar( '"' ).WriteOString( OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()) ).WriteChar( '\"' ); // TODO : think about the encoding of the font name m_pStream->WriteCharPtr( "; " ).WriteCharPtr( "font-size: " ); m_pStream->WriteInt32AsString(m_aFont.Height); @@ -738,7 +738,7 @@ void OHTMLImportExport::WriteTables() TAG_ON( OOO_STRING_SVTOOLS_HTML_caption ); TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); - m_pStream->WriteCharPtr( OUStringToOString(m_sName, osl_getThreadTextEncoding()).getStr() ); + m_pStream->WriteOString( OUStringToOString(m_sName, osl_getThreadTextEncoding()) ); // TODO : think about the encoding of the name TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption ); @@ -941,7 +941,7 @@ void OHTMLImportExport::FontOn() aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_color; aStrOut = aStrOut + "="; - m_pStream->WriteCharPtr( aStrOut.getStr() ); + m_pStream->WriteOString( aStrOut ); sal_Int32 nColor = 0; if(m_xObject.is()) diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 9e8110d4cde1..8a35b36c8beb 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -946,12 +946,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, nProp100).getStr() ).WriteChar( '}' ); } long nUpDown = nFontHeight * std::abs( nEsc ) / 100; - OString aUpDown = OString::number( - nUpDown); if ( nEsc < 0 ) - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_DN ).WriteCharPtr( aUpDown.getStr() ); + rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_DN ); else if ( nEsc > 0 ) - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UP ).WriteCharPtr( aUpDown.getStr() ); + rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UP ); + rOutput.WriteOString( OString::number(nUpDown) ); } break; } diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 9429f64aad61..cac944a1ec64 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -2364,7 +2364,7 @@ void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) { const OString aNumber(OString::number(nNumber)); mnCursorPos += aNumber.getLength(); - mpPS->WriteCharPtr( aNumber.getStr() ); + mpPS->WriteOString( aNumber ); ImplExecMode(nMode); } @@ -2377,7 +2377,7 @@ void PSWriter::ImplWriteDouble( double fNumber ) mpPS->WriteChar( '-' ); const OString aNumber1(OString::number(nPTemp)); - mpPS->WriteCharPtr( aNumber1.getStr() ); + mpPS->WriteOString( aNumber1 ); mnCursorPos += aNumber1.getLength(); if ( nATemp ) diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx index cc42ecd08168..358502b196ce 100644 --- a/filter/source/msfilter/rtfutil.cxx +++ b/filter/source/msfilter/rtfutil.cxx @@ -220,7 +220,7 @@ OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream, sa aRet.append('0'); } if (pStream) - pStream->WriteCharPtr(sNo.getStr()); + pStream->WriteOString(sNo); else aRet.append(sNo); if (++nBreak == nLimit) diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 5667dfb6ef43..195119d70d5a 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -24,6 +24,7 @@ #include <tools/ref.hxx> #include <vcl/errcode.hxx> #include <rtl/string.hxx> +#include <rtl/strbuf.hxx> #include <o3tl/typed_flags_set.hxx> #include <memory> @@ -246,7 +247,9 @@ public: SvStream& WriteUInt8( sal_uInt8 nuInt8 ); SvStream& WriteUnicode( sal_Unicode ); SvStream& WriteOString(const OString& rStr) - { return WriteCharPtr(rStr.getStr()); } + { WriteBytes(rStr.getStr(), rStr.getLength()); return *this; } + SvStream& WriteOStringBuffer(const OStringBuffer& rStr) + { WriteBytes(rStr.getStr(), rStr.getLength()); return *this; } SvStream& WriteStream( SvStream& rStream ); sal_uInt64 WriteStream( SvStream& rStream, sal_uInt64 nSize ); 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 ); } diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index ac9db8f6ed66..422cef0a55b5 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1153,9 +1153,8 @@ bool HtmlExport::WriteHtml( const OUString& rFileName, bool bAddExtension, const nErr = aFile.createStream(aFull , pStr); if(nErr == ERRCODE_NONE) { - OString aStr(OUStringToOString(rHtmlData, - RTL_TEXTENCODING_UTF8)); - pStr->WriteCharPtr( aStr.getStr() ); + OString aStr(OUStringToOString(rHtmlData, RTL_TEXTENCODING_UTF8)); + pStr->WriteOString( aStr ); aFile.close(); } @@ -2891,9 +2890,8 @@ bool HtmlExport::CopyScript( const OUString& rPath, const OUString& rSource, con nErr = aFile.createStream(aDest, pStr); if(nErr == ERRCODE_NONE) { - OString aStr(OUStringToOString(aScript, - RTL_TEXTENCODING_UTF8)); - pStr->WriteCharPtr( aStr.getStr() ); + OString aStr(OUStringToOString(aScript, RTL_TEXTENCODING_UTF8)); + pStr->WriteOString( aStr ); aFile.close(); } } diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index c1e4063dffd6..23bf6702b7cc 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -71,12 +71,12 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, 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.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStrm.WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rStrm, rName, eDestEnc, pNonConvertableChars ); sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content).append("=\""); - rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStrm.WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars ).WriteCharPtr( "\"/>" ); } @@ -123,7 +123,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_base).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_target).append("=\""); - rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStrm.WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rStrm, rTarget, eDestEnc, pNonConvertableChars ) .WriteCharPtr( "\">" ); } @@ -252,7 +252,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( rBaseURL, aURL ); sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src) .append("=\""); - rOut.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rOut.WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rOut, aURL, eDestEnc, pNonConvertableChars ); sOut.append('\"'); } @@ -263,7 +263,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name) .append("=\""); - rOut.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rOut.WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rOut, aStr, eDestEnc, pNonConvertableChars ); sOut.append('\"'); } @@ -307,7 +307,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( .append('=').append(pStr); } } - rOut.WriteCharPtr( sOut.getStr() ); + rOut.WriteOStringBuffer( sOut ); } catch (const uno::Exception&) { diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index 87a42b92f61b..f91da70ba66e 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -148,7 +148,7 @@ bool StgCompObjStream::Store() WriteInt32( -1 ); WriteClsId( *this, m_aClsId ); // Class ID WriteInt32( aAsciiUserName.getLength() + 1 ); - WriteCharPtr( aAsciiUserName.getStr() ); + WriteOString( aAsciiUserName ); WriteUChar( 0 ); // string terminator WriteClipboardFormat( *this, m_nCbFormat ); WriteInt32( 0 ); // terminator diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx index c4c21145f815..adbcba212828 100644 --- a/sot/source/sdstor/storinfo.cxx +++ b/sot/source/sdstor/storinfo.cxx @@ -80,7 +80,7 @@ void WriteClipboardFormat( SvStream & rStm, SotClipboardFormatId nFormat ) OString aAsciiCbFmt(OUStringToOString(aCbFmt, RTL_TEXTENCODING_ASCII_US)); rStm.WriteInt32( aAsciiCbFmt.getLength() + 1 ); - rStm.WriteCharPtr( aAsciiCbFmt.getStr() ); + rStm.WriteOString( aAsciiCbFmt ); rStm.WriteUChar( 0 ); } else if( nFormat != SotClipboardFormatId::NONE ) diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 6c6250fd01d0..2a69acfbf725 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -534,7 +534,7 @@ SvStream& HTMLOutFuncs::Out_Char( SvStream& rStream, sal_uInt32 c, OUString *pNonConvertableChars ) { OString sOut = lcl_ConvertCharToHTML( c, rContext, pNonConvertableChars ); - rStream.WriteCharPtr( sOut.getStr() ); + rStream.WriteOString( sOut ); return rStream; } @@ -557,7 +557,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream, OString sOut = lcl_FlushToAscii( rContext ); if (!sOut.isEmpty()) - rStream.WriteCharPtr( sOut.getStr() ); + rStream.WriteOString( sOut ); return rStream; } @@ -630,7 +630,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, .append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_name) .append("=\""); - rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStream.WriteOString( sOut.makeStringAndClear() ); Out_String( rStream, rOutName, eDestEnc, pNonConvertableChars ); rStream.WriteCharPtr( "\">" ); @@ -723,7 +723,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, .append('=').append(pShape).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_coords).append("=\"") .append(aCoords).append("\" "); - rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStream.WriteOString( sOut.makeStringAndClear() ); OUString aURL( pObj->GetURL() ); if( !aURL.isEmpty() && pObj->IsActive() ) @@ -731,7 +731,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, aURL = URIHelper::simpleNormalizedMakeRelative( rBaseURL, aURL ); sOut.append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\""); - rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStream.WriteOString( sOut.makeStringAndClear() ); Out_String( rStream, aURL, eDestEnc, pNonConvertableChars ).WriteChar( '\"' ); } else @@ -742,7 +742,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name) .append("=\""); - rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStream.WriteOString( sOut.makeStringAndClear() ); Out_String( rStream, rObjName, eDestEnc, pNonConvertableChars ).WriteChar( '\"' ); } @@ -751,7 +751,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_target) .append("=\""); - rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStream.WriteOString( sOut.makeStringAndClear() ); Out_String( rStream, rTarget, eDestEnc, pNonConvertableChars ).WriteChar( '\"' ); } @@ -763,7 +763,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt) .append("=\""); - rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStream.WriteOString( sOut.makeStringAndClear() ); Out_String( rStream, rDesc, eDestEnc, pNonConvertableChars ).WriteChar( '\"' ); } @@ -811,7 +811,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, sOut.append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_language) .append("=\""); - rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStrm.WriteOString( sOut.makeStringAndClear() ); Out_String( rStrm, rLanguage, eDestEnc, pNonConvertableChars ); sOut.append('\"'); } @@ -819,7 +819,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, if( !rSrc.isEmpty() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src).append("=\""); - rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStrm.WriteOString( sOut.makeStringAndClear() ); Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(rBaseURL, rSrc), eDestEnc, pNonConvertableChars ); sOut.append('\"'); } @@ -828,7 +828,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdlibrary) .append("=\""); - rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStrm.WriteOString( sOut.makeStringAndClear() ); Out_String( rStrm, *pSBLibrary, eDestEnc, pNonConvertableChars ); sOut.append('\"'); } @@ -837,14 +837,14 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdmodule) .append("=\""); - rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStrm.WriteOString( sOut.makeStringAndClear() ); Out_String( rStrm, *pSBModule, eDestEnc, pNonConvertableChars ); sOut.append('\"'); } sOut.append('>'); - rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStrm.WriteOString( sOut.makeStringAndClear() ); if( !rSource.isEmpty() || pSBLibrary || pSBModule ) { @@ -864,7 +864,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, .append(OOO_STRING_SVTOOLS_HTML_SB_library) .append(' ') .append(OUStringToOString(*pSBLibrary, eDestEnc)); - rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ).WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( sOut.makeStringAndClear() ).WriteCharPtr( SAL_NEWLINE_STRING ); } if( pSBModule ) @@ -873,7 +873,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, .append(OOO_STRING_SVTOOLS_HTML_SB_module) .append(' ') .append(OUStringToOString(*pSBModule, eDestEnc)); - rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ).WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( sOut.makeStringAndClear() ).WriteCharPtr( SAL_NEWLINE_STRING ); } } @@ -882,7 +882,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, // we write the module in ANSI-charset, but with // the system new line. const OString sSource(OUStringToOString(rSource, eDestEnc)); - rStrm.WriteCharPtr( sSource.getStr() ).WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( sSource ).WriteCharPtr( SAL_NEWLINE_STRING ); } rStrm.WriteCharPtr( SAL_NEWLINE_STRING ); @@ -925,7 +925,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm, { OStringBuffer sOut; sOut.append(' ').append(pStr).append("=\""); - rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rStrm.WriteOString( sOut.makeStringAndClear() ); Out_String( rStrm, pMacro->GetMacName(), eDestEnc, pNonConvertableChars ).WriteChar( '\"' ); } diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 791fd7ce081e..bfb3b3c932d5 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -151,7 +151,7 @@ SvStream& Out_Char(SvStream& rStream, sal_Unicode c, // #i47831# add an additional whitespace, so that // "document whitespaces" are not ignored.; rStream.WriteCharPtr( "\\uc" ) - .WriteCharPtr( OString::number(nLen).getStr() ).WriteCharPtr( " " ); + .WriteOString( OString::number(nLen) ).WriteCharPtr( " " ); *pUCMode = nLen; } rStream.WriteCharPtr( "\\u" ) diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 7453ebab540b..3bcba8d8e0cf 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -132,7 +132,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa xRowSet->getPropertyValue( gsSize ) >>= nRowHeight; mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH ).WriteCharPtr( "30" ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRLEFT ).WriteCharPtr( "-30" ); - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRRH ).WriteCharPtr( OString::number(nRowHeight).getStr() ); + mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRRH ).WriteOString( OString::number(nRowHeight) ); const sal_Int32 nColCount = mxTable->getColumnCount(); for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) @@ -142,7 +142,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa if( !xCell.is() ) continue; - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteCharPtr( OString::number(aColumnStart[nCol]).getStr() ); + mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteOString( OString::number(aColumnStart[nCol]) ); if ( (nCol & 0x0F) == 0x0F ) mrStrm.WriteCharPtr( SAL_NEWLINE_STRING ); // prevent long lines } diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index dae9bb9f0acf..c4bb72bf294c 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -787,7 +787,7 @@ void SwImplProtocol::Record_( const SwFrame* pFrame, PROT nFunction, DbgAction n aOut.append(lcl_CellInfo(pCellFrame)); } - pStream->WriteCharPtr( aOut.getStr() ); + pStream->WriteOStringBuffer( aOut ); (*pStream) << endl; // output pStream->Flush(); // to the disk, so we can read it immediately SAL_INFO("sw.layout.debug", aOut.getStr()); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 30ea4a999d80..892569bcd0db 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -287,7 +287,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, "p." sCSS2_P_CLASS_leaders " span+span{float:right;padding-left:0.33em;" "background:white;position:relative;z-index:1}"); } - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); IncIndentLevel(); } @@ -332,7 +332,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, if( m_nCSS1OutMode & CSS1_OUTMODE_ENCODE ) { // for STYLE-Option encode string - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); if( pVal ) HTMLOutFuncs::Out_String( Strm(), OUString::createFromAscii(pVal), m_eDestEnc, &m_aNonConvertableCharacters ); @@ -349,7 +349,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, } if (!sOut.isEmpty()) - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); } static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, @@ -1723,7 +1723,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, { rHTMLWrt.OutNewLine(); OString sTmp(OUStringToOString(aSelector, rHTMLWrt.m_eDestEnc)); - rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteCharPtr( " {" ); + rWrt.Strm().WriteOString( sTmp ).WriteCharPtr( " {" ); rHTMLWrt.m_bFirstCSS1Property = false; } @@ -3712,7 +3712,7 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet, break; } if (!sOut.isEmpty()) - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); } } diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 482fce55732e..5b4e846c2ed2 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -285,9 +285,9 @@ void SwHTMLWriter::OutBasic() .append(OOO_STRING_SVTOOLS_HTML_META_content_script_type) .append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content) .append("=\"text/x-"); - Strm().WriteCharPtr( sOut.getStr() ); + Strm().WriteOStringBuffer( sOut ); // Entities aren't welcome here - Strm().WriteCharPtr( OUStringToOString(sLang, m_eDestEnc).getStr() ) + Strm().WriteOString( OUStringToOString(sLang, m_eDestEnc) ) .WriteCharPtr( "\">" ); } diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index 21a8e15a75d2..64e49114f618 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -264,12 +264,12 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt, rItemSet.Get(XATTR_FILLCOLOR).GetColorValue(); sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append("="); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor ); } if (!sOut.isEmpty()) - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); // and now ALIGN, HSPACE and VSPACE HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_MARQUEE; @@ -293,7 +293,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt, HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_marquee, false ); if( !aEndTags.isEmpty() ) - rWrt.Strm().WriteCharPtr( aEndTags.getStr() ); + rWrt.Strm().WriteOString( aEndTags ); return rWrt; } diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index b6381f53847e..776b8e6ccf40 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -288,7 +288,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name). append("=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -296,7 +296,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value). append("=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -313,7 +313,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed); } sOut.append('>'); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); } // output content of the field @@ -463,7 +463,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt ) // not contained in the destination encoding are lost! OString sTmp(OUStringToOString(rText, static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc)); - rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteChar( '>' ); + rWrt.Strm().WriteOString( sTmp ).WriteChar( '>' ); } else if( SwFieldIds::Postit == pFieldTyp->Which() ) { @@ -484,7 +484,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt ) // characters not contained in the destination encoding are lost! OString sTmp(OUStringToOString(sComment, static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc)); - rWrt.Strm().WriteCharPtr( sTmp.getStr() ); + rWrt.Strm().WriteOString( sTmp ); bWritten = true; } else if( rComment.getLength() >= 7 && @@ -500,7 +500,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt ) // lost! OString sTmp(OUStringToOString(sComment, static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc)); - rWrt.Strm().WriteCharPtr( sTmp.getStr() ); + rWrt.Strm().WriteOString( sTmp ); bWritten = true; } @@ -514,7 +514,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt ) sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_comment) .append(' ').append(OUStringToOString(sComment, static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc)).append(" -->"); - rWrt.Strm().WriteCharPtr( sOut.getStr() ); + rWrt.Strm().WriteOStringBuffer( sOut ); } } else if( SwFieldIds::Script == pFieldTyp->Which() ) @@ -567,7 +567,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt ) Color& rColor = SwViewOption::GetFieldShadingsColor(); sOut.append(GetCSS1_Color(rColor)); sOut.append("\">"); - rWrt.Strm().WriteCharPtr(sOut.getStr()); + rWrt.Strm().WriteOStringBuffer(sOut); } OutHTML_SwField( rWrt, pField, pTextField->GetTextNode(), diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index c50f46acaa8d..8f2465c06871 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -442,7 +442,7 @@ void SwHTMLWriter::OutFrameFormat( AllHtmlFlags nMode, const SwFrameFormat& rFra sOut.append('<').append(GetNamespace() + aContainerStr).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"") .append("sd-abs-pos").append('\"'); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); // Output a width for non-draw objects HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_CNTNR; @@ -537,7 +537,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, (nFrameOpts & HtmlFrmOpts::Id) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name; sOut.append(' ').append(pStr). append("=\""); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), rFrameFormat.GetName(), m_eDestEnc, &m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -546,7 +546,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, if( nFrameOpts & HtmlFrmOpts::Dir ) { SvxFrameDirection nDir = GetHTMLDirection( rItemSet ); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); OutDirection( nDir ); } @@ -555,7 +555,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt). append("=\""); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), rAlternateText, m_eDestEnc, &m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -735,7 +735,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, } if (!sOut.isEmpty()) - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); // Insert wrap for graphics that are anchored to a paragraph as // <BR CLEAR=...> in the string @@ -1503,14 +1503,14 @@ Writer& OutHTML_BulletImage( Writer& rWrt, if(!aLink.isEmpty()) { sOut.append(OOO_STRING_SVTOOLS_HTML_O_src).append("=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aLink, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); } else { sOut.append("list-style-image: ").append("url("). append(OOO_STRING_SVTOOLS_HTML_O_data).append(":"); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append(");"); } @@ -1518,7 +1518,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt, if (pTag) sOut.append('>'); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); return rWrt; } @@ -1613,7 +1613,7 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt, append("=\"").append(static_cast<sal_Int32>(nGutter)).append("\""); } - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); // WIDTH HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_MULTICOL; @@ -1664,14 +1664,14 @@ static Writer& OutHTML_FrameFormatAsSpacer( Writer& rWrt, const SwFrameFormat& r sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_spacer).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_type).append("=\"") .append(OOO_STRING_SVTOOLS_HTML_SPTYPE_block).append("\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); // ALIGN, WIDTH, HEIGHT OString aEndTags = rHTMLWrt.OutFrameFormatOptions(rFrameFormat, OUString(), HTML_FRMOPTS_SPACER); rWrt.Strm().WriteChar( '>' ); if( !aEndTags.isEmpty() ) - rWrt.Strm().WriteCharPtr( aEndTags.getStr() ); + rWrt.Strm().WriteOString( aEndTags ); return rWrt; } @@ -1700,7 +1700,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt, OStringBuffer sOut; sOut.append('<').append(rHTMLWrt.GetNamespace() + aTag); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_DIV; if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) ) nFrameFlags |= HtmlFrmOpts::SNoBorder; @@ -1736,7 +1736,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt, HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rHTMLWrt.GetNamespace() + aTag, false ); if( !aEndTags.isEmpty() ) - rWrt.Strm().WriteCharPtr( aEndTags.getStr() ); + rWrt.Strm().WriteOString( aEndTags ); return rWrt; } diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index b2c9f8f51145..3b01bcf938a6 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -1274,7 +1274,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, } if( !aEndTags.isEmpty() ) - rWrt.Strm().WriteCharPtr( aEndTags.getStr() ); + rWrt.Strm().WriteOString( aEndTags ); // Controls aren't bound to a paragraph, therefore don't output LF anymore! rHTMLWrt.m_bLFPossible = false; diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 97b3d938fef6..85b5ffcb057e 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -278,20 +278,20 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt ) OStringBuffer sOut; OString aTag = rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor; sOut.append("<" + aTag + " " OOO_STRING_SVTOOLS_HTML_O_class "=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append("\" " OOO_STRING_SVTOOLS_HTML_O_name "=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor "\" " OOO_STRING_SVTOOLS_HTML_O_href "=\"#"); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol "\""); if( !rFormatFootnote.GetNumStr().isEmpty() ) sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_sdfixed); sOut.append(">"); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_superscript ); HTMLOutFuncs::Out_String( rWrt.Strm(), rFormatFootnote.GetViewNumStr(*rWrt.m_pDoc, nullptr), @@ -336,7 +336,7 @@ void SwHTMLWriter::OutFootEndNotes() OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division) .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id).append("=\""); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), sFootnoteName, m_eDestEnc, &m_aNonConvertableCharacters ); Strm().WriteCharPtr( "\">" ); @@ -443,17 +443,17 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFormatFootnote& rFormatFootnote, OStringBuffer sOut; sOut.append('<').append(GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\""); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), sClass, m_eDestEnc, &m_aNonConvertableCharacters ); sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\""); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), sFootnoteName, m_eDestEnc, &m_aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append("\" ") .append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#"); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), sFootnoteName, m_eDestEnc, &m_aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\">"); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), rNum, m_eDestEnc, &m_aNonConvertableCharacters ); HTMLOutFuncs::Out_AsciiTag( Strm(), GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor, false ); @@ -514,7 +514,7 @@ static void lcl_html_outFootEndNoteInfo( Writer& rWrt, OUString const *pParts, sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"").append(pName) .append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content).append("=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aContent.makeStringAndClear(), rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); rWrt.Strm().WriteCharPtr( "\">" ); } diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 89f061eb3973..6d5edafd5a0d 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -1237,7 +1237,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src) .append("=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aURL, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -1248,7 +1248,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type) .append("=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aType, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -1283,7 +1283,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_codebase) .append("=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), sCodeBase, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -1295,7 +1295,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor aAny >>= aClass; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_code) .append("=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); @@ -1307,7 +1307,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name) .append("=\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aAppletName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -1326,7 +1326,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor // or the Floating-Frame specifics sOut.append(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_iframe); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); SfxFrameHTMLWriter::Out_FrameDescriptor( rWrt.Strm(), rWrt.GetBaseURL(), xSet, @@ -1337,7 +1337,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor : HTML_FRMOPTS_IFRAME; } - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); // ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed ) @@ -1393,11 +1393,11 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor sBuf.append('<').append(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_param) .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name) .append("=\""); - rWrt.Strm().WriteCharPtr( sBuf.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sBuf.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sBuf.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_value) .append("=\""); - rWrt.Strm().WriteCharPtr( sBuf.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sBuf.makeStringAndClear() ); HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ).WriteCharPtr( "\">" ); } @@ -1441,7 +1441,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor } if( !aEndTags.isEmpty() ) - rWrt.Strm().WriteCharPtr( aEndTags.getStr() ); + rWrt.Strm().WriteOString( aEndTags ); return rWrt; } @@ -1495,7 +1495,7 @@ Writer& OutHTML_FrameFormatOLENodeGrf( Writer& rWrt, const SwFrameFormat& rFrame OString aData(static_cast<const char*>(aStream.GetData()), static_cast<sal_Int32>(aStream.GetSize())); // Wrap output in a <span> tag to avoid 'HTML parser error: Unexpected end tag: p' HTMLOutFuncs::Out_AsciiTag(rWrt.Strm(), rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_span); - rWrt.Strm().WriteCharPtr(aData.getStr()); + rWrt.Strm().WriteOString(aData); HTMLOutFuncs::Out_AsciiTag(rWrt.Strm(), rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_span, false); } catch ( uno::Exception& ) diff --git a/sw/source/filter/html/htmlreqifreader.cxx b/sw/source/filter/html/htmlreqifreader.cxx index a42bff8188d6..02f0e112ef0a 100644 --- a/sw/source/filter/html/htmlreqifreader.cxx +++ b/sw/source/filter/html/htmlreqifreader.cxx @@ -227,13 +227,13 @@ void WrapOleGraphicInRtf(SvStream& rRtf, const SwOLENode& rOLENode, const Graphi rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_WMETAFILE "8"); Size aSize(rOLENode.GetTwipSize()); rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICW); - rRtf.WriteCharPtr(OString::number(aSize.getWidth()).getStr()); + rRtf.WriteOString(OString::number(aSize.getWidth())); rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICH); - rRtf.WriteCharPtr(OString::number(aSize.getHeight()).getStr()); + rRtf.WriteOString(OString::number(aSize.getHeight())); rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICWGOAL); - rRtf.WriteCharPtr(OString::number(aSize.getWidth()).getStr()); + rRtf.WriteOString(OString::number(aSize.getWidth())); rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICHGOAL); - rRtf.WriteCharPtr(OString::number(aSize.getHeight()).getStr()); + rRtf.WriteOString(OString::number(aSize.getHeight())); SvMemoryStream aGraphicStream; if (GraphicConverter::Export(aGraphicStream, rGraphic, ConvertDataFormat::WMF) == ERRCODE_NONE) { @@ -318,9 +318,9 @@ bool WrapOleInRtf(SvStream& rOle2, SvStream& rRtf, SwOLENode& rOLENode) // Object size. rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_OBJW); - rRtf.WriteCharPtr(OString::number(nWidth).getStr()); + rRtf.WriteOString(OString::number(nWidth)); rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_OBJH); - rRtf.WriteCharPtr(OString::number(nHeight).getStr()); + rRtf.WriteOString(OString::number(nHeight)); // Start objdata. rRtf.WriteCharPtr( diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 30a07fa45782..da33a4bbb6eb 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -402,7 +402,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, } } - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); rWrt.m_bTextAttr = false; rWrt.m_bOutOpts = true; @@ -450,7 +450,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, &rWrt.m_aNonConvertableCharacters)); } sOut.append('>'); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); rWrt.m_bLFPossible = true; rWrt.IncIndentLevel(); // indent the content of <TD>...</TD> @@ -538,7 +538,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt, sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_valign) .append("=\"").append(text::VertOrientation::TOP==eRowVertOri ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom) .append("\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); } rWrt.Strm().WriteChar( '>' ); @@ -612,7 +612,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, rWrt.m_nDirection = rWrt.GetHTMLDirection( pFrameFormat->GetAttrSet() ); if( rWrt.m_bOutFlyFrame || nOldDirection != rWrt.m_nDirection ) { - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); rWrt.OutDirection( rWrt.m_nDirection ); } @@ -688,7 +688,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_cellspacing). append("=\"").append(static_cast<sal_Int32>(SwHTMLWriter::ToPixel(m_nCellSpacing,false))).append("\""); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); // output background if( pFrameFormat ) @@ -700,7 +700,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, } sOut.append('>'); - rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); rWrt.IncIndentLevel(); // indent content of table diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index f86ab2004dc2..0bc8cc347d64 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -439,7 +439,7 @@ ErrCode SwHTMLWriter::WriteStream() OutHiddenForms(); if( !aStartTags.isEmpty() ) - Strm().WriteCharPtr( aStartTags.getStr() ); + Strm().WriteOString( aStartTags ); const SfxPoolItem *pItem; const SfxItemSet& rPageItemSet = m_pCurrPageDesc->GetMaster().GetAttrSet(); @@ -609,19 +609,19 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, if( !rName.isEmpty() && !bContinued ) { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_id "=\""); - rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rHTMLWrt.Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), rName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } SvxFrameDirection nDir = rHTMLWrt.GetHTMLDirection( rFormat.GetAttrSet() ); - rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rHTMLWrt.Strm().WriteOString( sOut.makeStringAndClear() ); rHTMLWrt.OutDirection( nDir ); if( FILE_LINK_SECTION == rSection.GetType() ) { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_href "=\""); - rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rHTMLWrt.Strm().WriteOString( sOut.makeStringAndClear() ); const OUString& aFName = rSection.GetLinkFileName(); sal_Int32 nIdx{ 0 }; @@ -677,7 +677,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, } } - rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rHTMLWrt.Strm().WriteOString( sOut.makeStringAndClear() ); if( rHTMLWrt.IsHTMLMode( rHTMLWrt.m_bCfgOutStyles ? HTMLMODE_ON : 0 ) ) rHTMLWrt.OutCSS1_SectionFormatOptions( rFormat, pCol ); @@ -911,7 +911,7 @@ static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat, { OStringBuffer sOut; sOut.append(" " + OString(pTag) + "="); - rHWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + rHWrt.Strm().WriteOString( sOut.makeStringAndClear() ); Color aColor( pColorItem->GetValue() ); if( COL_AUTO == aColor ) aColor = COL_BLACK; @@ -1056,7 +1056,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) // the body won't be indented, because then everything would be indented! OutNewLine(); sOut.append("<" + GetNamespace() + OOO_STRING_SVTOOLS_HTML_body); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); // language OutLanguage( m_eLang ); @@ -1107,7 +1107,7 @@ void SwHTMLWriter::OutAnchor( const OUString& rName ) if (!mbXHTML) { sOut.append(OOO_STRING_SVTOOLS_HTML_O_name "=\""); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), rName, m_eDestEnc, &m_aNonConvertableCharacters ).WriteCharPtr( "\">" ); } else @@ -1115,7 +1115,7 @@ void SwHTMLWriter::OutAnchor( const OUString& rName ) // XHTML wants 'id' instead of 'name', also the value can't contain // spaces. sOut.append(OOO_STRING_SVTOOLS_HTML_O_id "=\""); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), rName.replace(' ', '_'), m_eDestEnc, &m_aNonConvertableCharacters ).WriteCharPtr( "\">" ); } HTMLOutFuncs::Out_AsciiTag( Strm(), GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor, false ); @@ -1200,7 +1200,7 @@ void SwHTMLWriter::OutPointFieldmarks( const SwPosition& rPos ) } aOut += "/>"; - Strm().WriteCharPtr(aOut.getStr()); + Strm().WriteOString(aOut); } } @@ -1263,7 +1263,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic { OStringBuffer sOut; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append('='); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_Color( Strm(), rBackColor); } @@ -1340,7 +1340,7 @@ void SwHTMLWriter::OutLanguage( LanguageType nLang ) else sOut.append(OOO_STRING_SVTOOLS_HTML_O_lang); sOut.append("=\""); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), LanguageTag::convertToBcp47(nLang), m_eDestEnc, &m_aNonConvertableCharacters ).WriteChar( '"' ); } @@ -1378,7 +1378,7 @@ void SwHTMLWriter::OutDirection( SvxFrameDirection nDir ) OStringBuffer sOut; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_dir) .append("=\"").append(sConverted).append('\"'); - Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + Strm().WriteOString( sOut.makeStringAndClear() ); } } diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index e9def02ef1a3..4d2c56e67593 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -325,12 +325,12 @@ void RtfAttributeOutput::SectionBreaks(const SwNode& rNode) OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty"); // output page/section breaks - m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aSectionBreaks.makeStringAndClear()); m_bBufferSectionBreaks = true; // output section headers / footers if (!m_bBufferSectionHeaders) - m_rExport.Strm().WriteCharPtr(m_aSectionHeaders.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aSectionHeaders.makeStringAndClear()); if (aNextIndex.GetNode().IsTextNode()) { @@ -370,7 +370,7 @@ void RtfAttributeOutput::StartParagraphProperties() aPar.append(' '); } if (!m_bBufferSectionHeaders) - m_rExport.Strm().WriteCharPtr(aPar.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(aPar.makeStringAndClear()); else m_aSectionHeaders.append(aPar.makeStringAndClear()); } @@ -381,7 +381,7 @@ void RtfAttributeOutput::EndParagraphProperties( const SwRedlineData* /*pRedlineParagraphMarkerInserted*/) { const OString aProperties = MoveCharacterProperties(true); - m_rExport.Strm().WriteCharPtr(aProperties.getStr()); + m_rExport.Strm().WriteOString(aProperties); } void RtfAttributeOutput::StartRun(const SwRedlineData* pRedlineData, sal_Int32 /*nPos*/, @@ -640,7 +640,7 @@ void RtfAttributeOutput::ParagraphStyle(sal_uInt16 nStyle) if (pStyle) aStyle.append(pStyle->getStr()); if (!m_bBufferSectionHeaders) - m_rExport.Strm().WriteCharPtr(aStyle.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(aStyle.makeStringAndClear()); else m_aSectionHeaders.append(aStyle.makeStringAndClear()); } @@ -1008,8 +1008,8 @@ void RtfAttributeOutput::StartTableRow( return; // Empty the previous row closing buffer before starting the new one, // necessary for subtables. - m_rExport.Strm().WriteCharPtr(m_aAfterRuns.makeStringAndClear().getStr()); - m_rExport.Strm().WriteCharPtr(m_aRowDefs.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aAfterRuns.makeStringAndClear()); + m_rExport.Strm().WriteOString(m_aRowDefs.makeStringAndClear()); } void RtfAttributeOutput::StartTableCell() { m_bTableCellOpen = true; } @@ -1135,7 +1135,7 @@ void RtfAttributeOutput::StartStyles() void RtfAttributeOutput::EndStyles(sal_uInt16 /*nNumberOfStyles*/) { m_rExport.Strm().WriteChar('}'); - m_rExport.Strm().WriteCharPtr(m_aStylesheet.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aStylesheet.makeStringAndClear()); m_rExport.Strm().WriteChar('}'); } @@ -1229,7 +1229,7 @@ void RtfAttributeOutput::StartSection() m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_SECT OOO_STRING_SVTOOLS_RTF_SECTD); if (!m_bBufferSectionBreaks) - m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aSectionBreaks.makeStringAndClear()); } void RtfAttributeOutput::EndSection() @@ -1363,7 +1363,7 @@ void RtfAttributeOutput::SectionType(sal_uInt8 nBreakCode) } m_aSectionBreaks.append(sType); if (!m_bBufferSectionBreaks) - m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aSectionBreaks.makeStringAndClear()); } void RtfAttributeOutput::NumberingDefinition(sal_uInt16 nId, const SwNumRule& /*rRule*/) @@ -1573,7 +1573,7 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, sal_uInt16 nStart, m_rExport.OutputItemSet(*pOutSet, false, true, i18n::ScriptType::LATIN, m_rExport.m_bExportModeRTF); const OString aProperties = MoveCharacterProperties(true); - m_rExport.Strm().WriteCharPtr(aProperties.getStr()); + m_rExport.Strm().WriteOString(aProperties); } m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FI); @@ -1914,8 +1914,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi m_rExport.OutULong(pObject->GetOrdNum()); } - m_rExport.Strm().WriteCharPtr(m_aRunText.makeStringAndClear().getStr()); - m_rExport.Strm().WriteCharPtr(m_aStyles.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aRunText.makeStringAndClear()); + m_rExport.Strm().WriteOString(m_aStyles.makeStringAndClear()); m_rExport.m_bOutFlyFrameAttrs = false; m_rExport.SetRTFFlySyntax(false); m_pFlyFrameSize = nullptr; @@ -1928,9 +1928,9 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi { m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{"); m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " "); - m_rExport.Strm().WriteCharPtr(rPair.first.getStr()); + m_rExport.Strm().WriteOString(rPair.first); m_rExport.Strm().WriteCharPtr("}{" OOO_STRING_SVTOOLS_RTF_SV " "); - m_rExport.Strm().WriteCharPtr(rPair.second.getStr()); + m_rExport.Strm().WriteOString(rPair.second); m_rExport.Strm().WriteCharPtr("}}"); } m_aFlyProperties.clear(); @@ -3022,7 +3022,7 @@ void RtfAttributeOutput::FormatFrameSize(const SwFormatFrameSize& rSize) m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGHSXN); m_aSectionBreaks.append(static_cast<sal_Int32>(rSize.GetHeight())); if (!m_bBufferSectionBreaks) - m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aSectionBreaks.makeStringAndClear()); } } @@ -3048,7 +3048,7 @@ void RtfAttributeOutput::FormatLRSpace(const SvxLRSpaceItem& rLRSpace) m_aSectionBreaks.append(static_cast<sal_Int32>(rLRSpace.GetRight())); } if (!m_bBufferSectionBreaks) - m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aSectionBreaks.makeStringAndClear()); } else { @@ -3115,7 +3115,7 @@ void RtfAttributeOutput::FormatULSpace(const SvxULSpaceItem& rULSpace) m_aSectionBreaks.append(static_cast<sal_Int32>(aDistances.dyaHdrBottom)); } if (!m_bBufferSectionBreaks) - m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aSectionBreaks.makeStringAndClear()); } else { @@ -3534,7 +3534,7 @@ void RtfAttributeOutput::FormatFrameDirection(const SvxFrameDirectionItem& rDire m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_STEXTFLOW); m_aSectionBreaks.append(static_cast<sal_Int32>(1)); if (!m_bBufferSectionBreaks) - m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); + m_rExport.Strm().WriteOString(m_aSectionBreaks.makeStringAndClear()); } return; } @@ -3887,14 +3887,14 @@ static OString ExportPICT(const SwFlyFrameFormat* pFlyFrameFormat, const Size& r } aRet.append(SAL_NEWLINE_STRING); if (pStream) - pStream->WriteCharPtr(aRet.makeStringAndClear().getStr()); + pStream->WriteOString(aRet.makeStringAndClear()); if (pStream) msfilter::rtfutil::WriteHex(pGraphicAry, nSize, pStream); else aRet.append(msfilter::rtfutil::WriteHex(pGraphicAry, nSize)); aRet.append('}'); if (pStream) - pStream->WriteCharPtr(aRet.makeStringAndClear().getStr()); + pStream->WriteOString(aRet.makeStringAndClear()); } return aRet.makeStringAndClear(); } @@ -4157,9 +4157,9 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat { m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{"); m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " "); - m_rExport.Strm().WriteCharPtr(rPair.first.getStr()); + m_rExport.Strm().WriteOString(rPair.first); m_rExport.Strm().WriteCharPtr("}{" OOO_STRING_SVTOOLS_RTF_SV " "); - m_rExport.Strm().WriteCharPtr(rPair.second.getStr()); + m_rExport.Strm().WriteOString(rPair.second); m_rExport.Strm().WriteCharPtr("}}"); } m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{" OOO_STRING_SVTOOLS_RTF_SN diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index bc255784f3a8..9b98ce3bd4aa 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -437,9 +437,9 @@ void RtfExport::WriteMainText() { Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{"); Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " "); - Strm().WriteCharPtr(rPair.first.getStr()); + Strm().WriteOString(rPair.first); Strm().WriteCharPtr("}{" OOO_STRING_SVTOOLS_RTF_SV " "); - Strm().WriteCharPtr(rPair.second.getStr()); + Strm().WriteOString(rPair.second); Strm().WriteCharPtr("}}"); } Strm().WriteChar('}'); // shpinst @@ -470,7 +470,7 @@ void RtfExport::WriteInfo() = OUStringToOString(utl::DocInfoHelper::GetGeneratorString(), RTL_TEXTENCODING_UTF8); Strm() .WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE LO_STRING_SVTOOLS_RTF_GENERATOR " ") - .WriteCharPtr(aGenerator.getStr()) + .WriteOString(aGenerator) .WriteChar('}'); Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_INFO); @@ -531,7 +531,7 @@ void RtfExport::WriteUserPropType(int nType) void RtfExport::WriteUserPropValue(const OUString& rValue) { Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_STATICVAL " "); - Strm().WriteCharPtr(msfilter::rtfutil::OutString(rValue, m_eDefaultEncoding).getStr()); + Strm().WriteOString(msfilter::rtfutil::OutString(rValue, m_eDefaultEncoding)); Strm().WriteChar('}'); } @@ -707,7 +707,7 @@ ErrCode RtfExport::ExportDocument_Impl() WriteUserProps(); // Default TabSize Strm() - .WriteCharPtr(m_pAttrOutput->GetTabStop().makeStringAndClear().getStr()) + .WriteOString(m_pAttrOutput->GetTabStop().makeStringAndClear()) .WriteCharPtr(SAL_NEWLINE_STRING); // Automatic hyphenation: it's a global setting in Word, it's a paragraph setting in Writer. diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx b/sw/source/filter/ww8/rtfstringbuffer.cxx index 2a4bb12fe352..055ace53a429 100644 --- a/sw/source/filter/ww8/rtfstringbuffer.cxx +++ b/sw/source/filter/ww8/rtfstringbuffer.cxx @@ -22,7 +22,7 @@ RtfStringBufferValue::RtfStringBufferValue(const SwFlyFrameFormat* pFlyFrameForm void RtfStringBufferValue::makeStringAndClear(RtfAttributeOutput* pAttributeOutput) { if (!isGraphic()) - pAttributeOutput->m_rExport.Strm().WriteCharPtr(m_aBuffer.makeStringAndClear().getStr()); + pAttributeOutput->m_rExport.Strm().WriteOString(m_aBuffer.makeStringAndClear()); else pAttributeOutput->FlyFrameGraphic(m_pFlyFrameFormat, m_pGrfNode); } diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index c23289923af4..a26212fa1761 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -42,9 +42,9 @@ int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uInt32 nSize) if (aHeader.GetValue().getLength()) { // NYI: Folding long lines. - maMsgBuffer.WriteCharPtr( aHeader.GetName().getStr() ); + maMsgBuffer.WriteOString( aHeader.GetName() ); maMsgBuffer.WriteCharPtr( ": " ); - maMsgBuffer.WriteCharPtr( aHeader.GetValue().getStr() ); + maMsgBuffer.WriteOString( aHeader.GetValue() ); maMsgBuffer.WriteCharPtr( "\r\n" ); } } |