diff options
44 files changed, 891 insertions, 905 deletions
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 002abfe38301..d405ff344417 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -689,7 +689,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) static sal_uInt16 nLevel = 0; if ( nLevel > 10 ) { - rStrm.WriteCharPtr( "<too deep>" ) << endl; + rStrm.WriteOString( "<too deep>" ) << endl; return; } ++nLevel; @@ -701,38 +701,38 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) // Output the data of the object itself OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US)); - rStrm.WriteCharPtr( "Object( " ) - .WriteOString( OString::number(reinterpret_cast<sal_IntPtr>(this)) ).WriteCharPtr( "=='" ) - .WriteCharPtr( aNameStr.isEmpty() ? "<unnamed>" : aNameStr.getStr() ).WriteCharPtr( "', " ) - .WriteCharPtr( "of class '" ).WriteOString( aClassNameStr ).WriteCharPtr( "', " ) - .WriteCharPtr( "counts " ) + rStrm.WriteOString( "Object( " ) + .WriteOString( OString::number(reinterpret_cast<sal_IntPtr>(this)) ).WriteOString( "=='" ) + .WriteOString( aNameStr.isEmpty() ? "<unnamed>" : aNameStr ).WriteOString( "', " ) + .WriteOString( "of class '" ).WriteOString( aClassNameStr ).WriteOString( "', " ) + .WriteOString( "counts " ) .WriteOString( OString::number(GetRefCount()) ) - .WriteCharPtr( " refs, " ); + .WriteOString( " refs, " ); if ( GetParent() ) { OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); - rStrm.WriteCharPtr( "in parent " ) + rStrm.WriteOString( "in parent " ) .WriteOString( OString::number(reinterpret_cast<sal_IntPtr>(GetParent())) ) - .WriteCharPtr( "=='" ).WriteCharPtr( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr.getStr() ).WriteCharPtr( "'" ); + .WriteOString( "=='" ).WriteOString( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr ).WriteOString( "'" ); } else { - rStrm.WriteCharPtr( "no parent " ); + rStrm.WriteOString( "no parent " ); } - rStrm.WriteCharPtr( " )" ) << endl; + rStrm.WriteOString( " )" ) << endl; OString aIndentNameStr(OUStringToOString(aIndent, RTL_TEXTENCODING_ASCII_US)); - rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "{" ) << endl; + rStrm.WriteOString( aIndentNameStr ).WriteOString( "{" ) << endl; // Flags OUString aAttrs; if( CollectAttrs( this, aAttrs ) ) { OString aAttrStr(OUStringToOString(aAttrs, RTL_TEXTENCODING_ASCII_US)); - rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "- Flags: " ).WriteOString( aAttrStr ) << endl; + rStrm.WriteOString( aIndentNameStr ).WriteOString( "- Flags: " ).WriteOString( aAttrStr ) << endl; } // Methods - rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "- Methods:" ) << endl; + rStrm.WriteOString( aIndentNameStr ).WriteOString( "- Methods:" ) << endl; for (sal_uInt32 i = 0; i < pMethods->Count(); i++) { SbxVariableRef& r = pMethods->GetRef(i); @@ -757,7 +757,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) pVar->GetValues_Impl().pObj != this && pVar->GetValues_Impl().pObj != GetParent() ) { - rStrm.WriteCharPtr( " contains " ); + rStrm.WriteOString( " contains " ); static_cast<SbxObject*>(pVar->GetValues_Impl().pObj)->Dump( rStrm, bFill ); } else @@ -768,7 +768,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) } // Properties - rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "- Properties:" ) << endl; + rStrm.WriteOString( aIndentNameStr ).WriteOString( "- Properties:" ) << endl; { for (sal_uInt32 i = 0; i < pProps->Count(); i++) { @@ -794,7 +794,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) pVar->GetValues_Impl().pObj != this && pVar->GetValues_Impl().pObj != GetParent() ) { - rStrm.WriteCharPtr( " contains " ); + rStrm.WriteOString( " contains " ); static_cast<SbxObject*>(pVar->GetValues_Impl().pObj)->Dump( rStrm, bFill ); } else @@ -806,7 +806,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) } // Objects - rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "- Objects:" ) << endl; + rStrm.WriteOString( aIndentNameStr ).WriteOString( "- Objects:" ) << endl; { for (sal_uInt32 i = 0; i < pObjs->Count(); i++) { @@ -814,7 +814,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) SbxVariable* pVar = r.get(); if ( pVar ) { - rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( " - Sub" ); + rStrm.WriteOString( aIndentNameStr ).WriteOString( " - Sub" ); if (SbxObject *pSbxObj = dynamic_cast<SbxObject*>(pVar)) { pSbxObj->Dump(rStrm, bFill); @@ -827,7 +827,7 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) } } - rStrm.WriteOString( aIndentNameStr ).WriteCharPtr( "}" ) << endl << endl; + rStrm.WriteOString( aIndentNameStr ).WriteOString( "}" ) << endl << endl; --nLevel; } diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index effcfc495366..cc57a804bc61 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -572,19 +572,19 @@ SbxInfo::SbxInfo( OUString a, sal_uInt32 n ) void SbxVariable::Dump( SvStream& rStrm, bool bFill ) { OString aBNameStr(OUStringToOString(GetName( SbxNameType::ShortTypes ), RTL_TEXTENCODING_ASCII_US)); - rStrm.WriteCharPtr( "Variable( " ) - .WriteOString( OString::number(reinterpret_cast<sal_IntPtr>(this)) ).WriteCharPtr( "==" ) + rStrm.WriteOString( "Variable( " ) + .WriteOString( OString::number(reinterpret_cast<sal_IntPtr>(this)) ).WriteOString( "==" ) .WriteOString( aBNameStr ); OString aBParentNameStr(OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US)); if ( GetParent() ) { - rStrm.WriteCharPtr( " in parent '" ).WriteOString( aBParentNameStr ).WriteCharPtr( "'" ); + rStrm.WriteOString( " in parent '" ).WriteOString( aBParentNameStr ).WriteOString( "'" ); } else { - rStrm.WriteCharPtr( " no parent" ); + rStrm.WriteOString( " no parent" ); } - rStrm.WriteCharPtr( " ) " ); + rStrm.WriteOString( " ) " ); // output also the object at object-vars if ( GetValues_Impl().eType == SbxOBJECT && @@ -592,7 +592,7 @@ void SbxVariable::Dump( SvStream& rStrm, bool bFill ) GetValues_Impl().pObj != this && GetValues_Impl().pObj != GetParent() ) { - rStrm.WriteCharPtr( " contains " ); + rStrm.WriteOString( " contains " ); static_cast<SbxObject*>(GetValues_Impl().pObj)->Dump( rStrm, bFill ); } else diff --git a/compilerplugins/clang/store/svstreamoutputoperators.cxx b/compilerplugins/clang/store/svstreamoutputoperators.cxx index 6e0ff616844d..f4ac13c6e743 100644 --- a/compilerplugins/clang/store/svstreamoutputoperators.cxx +++ b/compilerplugins/clang/store/svstreamoutputoperators.cxx @@ -110,9 +110,9 @@ bool SvStreamOutputOperators::VisitCallExpr( const CallExpr* callExpr ) else if( arg0 == "const double &" ) newIOMethod = "WriteDouble"; else if( arg0 == "const char *" ) - newIOMethod = "WriteCharPtr"; + newIOMethod = "WriteOString"; else if( arg0 == "char *" ) - newIOMethod = "WriteCharPtr"; + newIOMethod = "WriteOString"; else if( arg0 == "const unsigned char *" ) newIOMethod = "WriteUCharPtr"; else if( arg0 == "unsigned char *" ) diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index f5df775dc515..dea0a750646d 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -320,13 +320,13 @@ bool ODatabaseImportExport::Read() bool ORTFImportExport::Write() { ODatabaseImportExport::Write(); - m_pStream->WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF ); - m_pStream->WriteCharPtr(OOO_STRING_SVTOOLS_RTF_ANSI); + m_pStream->WriteChar( '{' ).WriteOString( OOO_STRING_SVTOOLS_RTF_RTF ); + m_pStream->WriteOString(OOO_STRING_SVTOOLS_RTF_ANSI); if (sal_uInt32 nCpg = rtl_getWindowsCodePageFromTextEncoding(m_eDestEnc); nCpg && nCpg != 65001) { - m_pStream->WriteCharPtr(OOO_STRING_SVTOOLS_RTF_ANSICPG).WriteUInt32AsString(nCpg); + m_pStream->WriteOString(OOO_STRING_SVTOOLS_RTF_ANSICPG).WriteUInt32AsString(nCpg); } - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING); + m_pStream->WriteOString(SAL_NEWLINE_STRING); bool bBold = ( css::awt::FontWeight::BOLD == m_aFont.Weight ); bool bItalic = ( css::awt::FontSlant_ITALIC == m_aFont.Slant ); @@ -344,37 +344,37 @@ bool ORTFImportExport::Write() aFonts = OUStringToOString(aName, RTL_TEXTENCODING_MS_1252); } - m_pStream->WriteCharPtr( "{\\fonttbl" ); + m_pStream->WriteOString( "{\\fonttbl" ); if (!aFonts.isEmpty()) { sal_Int32 nIdx{0}; sal_Int32 nTok{-1}; // to compensate pre-increment do { - m_pStream->WriteCharPtr( "\\f" ); + m_pStream->WriteOString( "\\f" ); m_pStream->WriteInt32AsString(++nTok); - m_pStream->WriteCharPtr( "\\fcharset0\\fnil " ); + m_pStream->WriteOString( "\\fcharset0\\fnil " ); m_pStream->WriteOString( o3tl::getToken(aFonts, 0, ';', nIdx) ); m_pStream->WriteChar( ';' ); } while (nIdx>=0); } m_pStream->WriteChar( '}' ) ; - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ); // write the rtf color table - m_pStream->WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLORTBL ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RED ); + m_pStream->WriteChar( '{' ).WriteOString( OOO_STRING_SVTOOLS_RTF_COLORTBL ).WriteOString( OOO_STRING_SVTOOLS_RTF_RED ); m_pStream->WriteUInt32AsString(aColor.GetRed()); - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_GREEN ); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_GREEN ); m_pStream->WriteUInt32AsString(aColor.GetGreen()); - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_BLUE ); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_BLUE ); m_pStream->WriteUInt32AsString(aColor.GetBlue()); - m_pStream->WriteCharPtr( ";\\red255\\green255\\blue255;\\red192\\green192\\blue192;}" ) - .WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( ";\\red255\\green255\\blue255;\\red192\\green192\\blue192;}" ) + .WriteOString( SAL_NEWLINE_STRING ); static char const aCell1[] = "\\clbrdrl\\brdrs\\brdrcf0\\clbrdrt\\brdrs\\brdrcf0\\clbrdrb\\brdrs\\brdrcf0\\clbrdrr\\brdrs\\brdrcf0\\clshdng10000\\clcfpat2\\cellx"; - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH ); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteOString( OOO_STRING_SVTOOLS_RTF_TRGAPH ); m_pStream->WriteInt32AsString(40); - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ); if(m_xObject.is()) { @@ -393,14 +393,14 @@ bool ORTFImportExport::Write() for( sal_Int32 i=1; i<=nCount; ++i ) { - m_pStream->WriteCharPtr( aCell1 ); + m_pStream->WriteOString( aCell1 ); m_pStream->WriteInt32AsString(i*CELL_X); - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ); } // column description - m_pStream->WriteChar( '{' ).WriteCharPtr( SAL_NEWLINE_STRING ); - m_pStream->WriteCharPtr( "\\trrh-270\\pard\\intbl" ); + m_pStream->WriteChar( '{' ).WriteOString( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( "\\trrh-270\\pard\\intbl" ); std::unique_ptr<OString[]> pHorzChar(new OString[nCount]); @@ -430,28 +430,28 @@ bool ORTFImportExport::Write() pHorzChar[i-1] = pChar; // to avoid to always rummage in the ITEMSET later on - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ); m_pStream->WriteChar( '{' ); - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QC ); // column header always centered + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_QC ); // column header always centered - if ( bBold ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B ); - if ( bItalic ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I ); - if ( bUnderline ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL ); - if ( bStrikeout ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STRIKE ); + if ( bBold ) m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_B ); + if ( bItalic ) m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_I ); + if ( bUnderline ) m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_UL ); + if ( bStrikeout ) m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_STRIKE ); - m_pStream->WriteCharPtr( "\\fs20\\f0\\cf0\\cb2" ); + m_pStream->WriteOString( "\\fs20\\f0\\cf0\\cb2" ); m_pStream->WriteChar( ' ' ); RTFOutFuncs::Out_String(*m_pStream, sColumnName, m_eDestEnc); - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL ); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_CELL ); m_pStream->WriteChar( '}' ); - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_PARD ).WriteOString( OOO_STRING_SVTOOLS_RTF_INTBL ); } - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW ); - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ).WriteChar( '}' ); - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_ROW ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ).WriteChar( '}' ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ); sal_Int32 k=1; sal_Int32 kk=0; @@ -488,7 +488,7 @@ bool ORTFImportExport::Write() } } - m_pStream->WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteChar( '}' ).WriteOString( SAL_NEWLINE_STRING ); m_pStream->WriteUChar( 0 ); return ((*m_pStream).GetError() == ERRCODE_NONE); } @@ -496,17 +496,17 @@ bool ORTFImportExport::Write() void ORTFImportExport::appendRow(OString const * pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk) { ++kk; - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH ); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteOString( OOO_STRING_SVTOOLS_RTF_TRGAPH ); m_pStream->WriteInt32AsString(40); - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ); static char const aCell2[] = "\\clbrdrl\\brdrs\\brdrcf2\\clbrdrt\\brdrs\\brdrcf2\\clbrdrb\\brdrs\\brdrcf2\\clbrdrr\\brdrs\\brdrcf2\\clshdng10000\\clcfpat1\\cellx"; for ( sal_Int32 i=1; i<=_nColumnCount; ++i ) { - m_pStream->WriteCharPtr( aCell2 ); + m_pStream->WriteOString( aCell2 ); m_pStream->WriteInt32AsString(i*CELL_X); - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ); } const bool bBold = ( css::awt::FontWeight::BOLD == m_aFont.Weight ); @@ -516,19 +516,19 @@ void ORTFImportExport::appendRow(OString const * pHorzChar,sal_Int32 _nColumnCou Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY); m_pStream->WriteChar( '{' ); - m_pStream->WriteCharPtr( "\\trrh-270\\pard\\intbl" ); + m_pStream->WriteOString( "\\trrh-270\\pard\\intbl" ); for ( sal_Int32 i=1; i <= _nColumnCount; ++i ) { - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ); m_pStream->WriteChar( '{' ); 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 ); - if ( bUnderline ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL ); - if ( bStrikeout ) m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STRIKE ); + if ( bBold ) m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_B ); + if ( bItalic ) m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_I ); + if ( bUnderline ) m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_UL ); + if ( bStrikeout ) m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_STRIKE ); - m_pStream->WriteCharPtr( "\\fs20\\f1\\cf0\\cb1 " ); + m_pStream->WriteOString( "\\fs20\\f1\\cf0\\cb1 " ); try { @@ -543,12 +543,12 @@ void ORTFImportExport::appendRow(OString const * pHorzChar,sal_Int32 _nColumnCou SAL_WARN("dbaccess.ui","RTF WRITE!"); } - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL ); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_CELL ); m_pStream->WriteChar( '}' ); - m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ); - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL ); + m_pStream->WriteOString( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_PARD ).WriteOString( OOO_STRING_SVTOOLS_RTF_INTBL ); } - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW ).WriteCharPtr( SAL_NEWLINE_STRING ); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_RTF_ROW ).WriteOString( SAL_NEWLINE_STRING ); m_pStream->WriteChar( '}' ); ++k; } @@ -591,13 +591,13 @@ bool OHTMLImportExport::Write() ODatabaseImportExport::Write(); if(m_xObject.is()) { - m_pStream->WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype5 ).WriteChar( '>' ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( SAL_NEWLINE_STRING ); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_html).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + m_pStream->WriteChar( '<' ).WriteOString( OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteOString( OOO_STRING_SVTOOLS_HTML_doctype5 ).WriteChar( '>' ).WriteOString( SAL_NEWLINE_STRING ).WriteOString( SAL_NEWLINE_STRING ); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_html).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); WriteHeader(); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); WriteBody(); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_html, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_html, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); return ((*m_pStream).GetError() == ERRCODE_NONE); } @@ -629,52 +629,52 @@ void OHTMLImportExport::WriteHeader() } IncIndent(1); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_head).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_head).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); SfxFrameHTMLWriter::Out_DocInfo( (*m_pStream), OUString(), xDocProps, sIndent ); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); IncIndent(-1); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_head, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_head, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); } void OHTMLImportExport::WriteBody() { IncIndent(1); - m_pStream->WriteCharPtr( "<" ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_style ).WriteCharPtr( " " ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_type ).WriteCharPtr( "=\"text/css\">" ); + m_pStream->WriteOString( "<" ).WriteOString( OOO_STRING_SVTOOLS_HTML_style ).WriteOString( " " ).WriteOString( OOO_STRING_SVTOOLS_HTML_O_type ).WriteOString( "=\"text/css\">" ); - m_pStream->WriteCharPtr( "<!-- " ); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); - m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body ).WriteCharPtr( " { " ).WriteCharPtr( "font-family: " ).WriteChar( '"' ).WriteOString( OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()) ).WriteChar( '\"' ); + m_pStream->WriteOString( "<!-- " ); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); + m_pStream->WriteOString( OOO_STRING_SVTOOLS_HTML_body ).WriteOString( " { " ).WriteOString( "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->WriteOString( "; " ).WriteOString( "font-size: " ); m_pStream->WriteInt32AsString(m_aFont.Height); m_pStream->WriteChar( '}' ); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); - m_pStream->WriteCharPtr( " -->" ); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); + m_pStream->WriteOString( " -->" ); IncIndent(-1); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_style, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_style, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); // default Textcolour black - m_pStream->WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_text ).WriteChar( '=' ); + m_pStream->WriteChar( '<' ).WriteOString( OOO_STRING_SVTOOLS_HTML_body ).WriteChar( ' ' ).WriteOString( OOO_STRING_SVTOOLS_HTML_O_text ).WriteChar( '=' ); ::Color aColor; if(m_xObject.is()) m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= aColor; HTMLOutFuncs::Out_Color( (*m_pStream), aColor ); - m_pStream->WriteCharPtr( " " OOO_STRING_SVTOOLS_HTML_O_bgcolor "=" ); + m_pStream->WriteOString( " " OOO_STRING_SVTOOLS_HTML_O_bgcolor "=" ); HTMLOutFuncs::Out_Color( (*m_pStream), aColor ); m_pStream->WriteChar( '>' ); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); WriteTables(); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_body, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_body, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); } void OHTMLImportExport::WriteTables() @@ -734,14 +734,14 @@ void OHTMLImportExport::WriteTables() HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_caption, false); FontOff(); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); // </FONT> IncIndent(1); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_thead).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_thead).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); IncIndent(1); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tablerow).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tablerow).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); if(m_xObject.is()) { @@ -785,11 +785,11 @@ void OHTMLImportExport::WriteTables() } IncIndent(-1); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tablerow, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_thead, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tablerow, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_thead, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); IncIndent(1); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tbody).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tbody).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); // 2. and now the data Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY); @@ -797,7 +797,7 @@ void OHTMLImportExport::WriteTables() while(m_xResultSet->next()) { IncIndent(1); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tablerow).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tablerow).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); for(sal_Int32 i=1;i<=aNames.getLength();++i) { @@ -821,24 +821,24 @@ void OHTMLImportExport::WriteTables() } WriteCell(pFormat[i-1],pColWidth[i-1],nHeight,pHorJustify[i-1],aValue,OOO_STRING_SVTOOLS_HTML_tabledata); } - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tablerow, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tablerow, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); } } else { IncIndent(-1); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tablerow, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_thead, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tablerow, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_thead, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); IncIndent(1); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tbody).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tbody).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); } IncIndent(-1); - m_pStream->WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tbody, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + m_pStream->WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_tbody, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); IncIndent(-1); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_table, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, OOO_STRING_SVTOOLS_HTML_table, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); } void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal_Int32 nHeightPixel, const char* pChar, @@ -909,7 +909,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal FontOff(); - HTMLOutFuncs::Out_AsciiTag(*m_pStream, pHtmlTag, false).WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(GetIndentStr()); + HTMLOutFuncs::Out_AsciiTag(*m_pStream, pHtmlTag, false).WriteOString(SAL_NEWLINE_STRING).WriteOString(GetIndentStr()); } void OHTMLImportExport::FontOn() @@ -938,7 +938,7 @@ void OHTMLImportExport::FontOn() m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= aColor; HTMLOutFuncs::Out_Color( (*m_pStream), aColor ); - m_pStream->WriteCharPtr( ">" ); + m_pStream->WriteOString( ">" ); } inline void OHTMLImportExport::FontOff() diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx index 5fb18dfad0bf..92f060b976e2 100644 --- a/desktop/source/app/updater.cxx +++ b/desktop/source/app/updater.cxx @@ -838,7 +838,7 @@ void Updater::log(const char* pMessage) OUString aUpdateLog = getUpdateInfoLog(); SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE); aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the end - aLog.WriteCharPtr(pMessage); + aLog.WriteOString(pMessage); } OUString Updater::getBuildID() diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 2bc0e8a2e8a7..a2b3b07d8db2 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -286,9 +286,9 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) // RTF header ... rOutput.WriteChar( '{' ) ; - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_RTF ); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_ANSI ); rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252; // Generate and write out Font table ... @@ -321,31 +321,31 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) } rOutput << endl; - rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FONTTBL ); + rOutput.WriteChar( '{' ).WriteOString( OOO_STRING_SVTOOLS_RTF_FONTTBL ); for ( std::vector<SvxFontItem*>::size_type j = 0; j < aFontTable.size(); j++ ) { SvxFontItem* pFontItem = aFontTable[ j ].get(); rOutput.WriteChar( '{' ); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_F ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_F ); rOutput.WriteUInt32AsString( j ); switch ( pFontItem->GetFamily() ) { - case FAMILY_DONTKNOW: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FNIL ); + case FAMILY_DONTKNOW: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_FNIL ); break; - case FAMILY_DECORATIVE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FDECOR ); + case FAMILY_DECORATIVE: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_FDECOR ); break; - case FAMILY_MODERN: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FMODERN ); + case FAMILY_MODERN: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_FMODERN ); break; - case FAMILY_ROMAN: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FROMAN ); + case FAMILY_ROMAN: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_FROMAN ); break; - case FAMILY_SCRIPT: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FSCRIPT ); + case FAMILY_SCRIPT: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_FSCRIPT ); break; - case FAMILY_SWISS: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FSWISS ); + case FAMILY_SWISS: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_FSWISS ); break; default: break; } - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FPRQ ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_FPRQ ); sal_uInt16 nVal = 0; switch( pFontItem->GetPitch() ) { @@ -370,12 +370,12 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) DBG_ASSERT( eChrSet != 9, "SystemCharSet?!" ); if( RTL_TEXTENCODING_DONTKNOW == eChrSet ) eChrSet = osl_getThreadTextEncoding(); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FCHARSET ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_FCHARSET ); rOutput.WriteUInt32AsString( rtl_getBestWindowsCharsetFromTextEncoding( eChrSet ) ); rOutput.WriteChar( ' ' ); RTFOutFuncs::Out_String( rOutput, pFontItem->GetFamilyName(), eDestEnc ); - rOutput.WriteCharPtr( ";}" ); + rOutput.WriteOString( ";}" ); } rOutput.WriteChar( '}' ); rOutput << endl; @@ -398,17 +398,17 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) } } - rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLORTBL ); + rOutput.WriteChar( '{' ).WriteOString( OOO_STRING_SVTOOLS_RTF_COLORTBL ); for ( SvxColorList::size_type j = 0; j < aColorList.size(); j++ ) { Color const color = aColorList[j]; if (color != COL_AUTO) // auto is represented by "empty" element { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RED ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_RED ); rOutput.WriteUInt32AsString( color.GetRed() ); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_GREEN ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_GREEN ); rOutput.WriteUInt32AsString( color.GetGreen() ); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_BLUE ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_BLUE ); rOutput.WriteUInt32AsString( color.GetBlue() ); } rOutput.WriteChar( ';' ); @@ -435,14 +435,14 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) { sal_uInt32 nStyle = 0; - rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STYLESHEET ); + rOutput.WriteChar( '{' ).WriteOString( OOO_STRING_SVTOOLS_RTF_STYLESHEET ); for ( SfxStyleSheetBase* pStyle = aSSSIterator->First(); pStyle; pStyle = aSSSIterator->Next() ) { rOutput << endl; - rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_S ); + rOutput.WriteChar( '{' ).WriteOString( OOO_STRING_SVTOOLS_RTF_S ); sal_uInt32 nNumber = nStyle + 1; rOutput.WriteUInt32AsString( nNumber ); @@ -461,7 +461,7 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) { SfxStyleSheet* pParent = static_cast<SfxStyleSheet*>(GetStyleSheetPool()->Find( pStyle->GetParent(), pStyle->GetFamily() )); DBG_ASSERT( pParent, "Parent not found!" ); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SBASEDON ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_SBASEDON ); nNumber = aStyleSheetToIdMap.find(pParent)->second; rOutput.WriteUInt32AsString( nNumber ); } @@ -473,14 +473,14 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) pNext = static_cast<SfxStyleSheet*>(GetStyleSheetPool()->Find( pStyle->GetFollow(), pStyle->GetFamily() )); DBG_ASSERT( pNext, "Next not found!" ); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SNEXT ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_SNEXT ); nNumber = aStyleSheetToIdMap.find(pNext)->second; rOutput.WriteUInt32AsString( nNumber ); // Name of the template... - rOutput.WriteCharPtr( " " ); + rOutput.WriteOString( " " ); RTFOutFuncs::Out_String( rOutput, pStyle->GetName(), eDestEnc ); - rOutput.WriteCharPtr( ";}" ); + rOutput.WriteOString( ";}" ); nStyle++; } rOutput.WriteChar( '}' ); @@ -489,7 +489,7 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) } // Write the pool defaults in advance ... - rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( "\\EditEnginePoolDefaults" ); + rOutput.WriteChar( '{' ).WriteOString( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteOString( "\\EditEnginePoolDefaults" ); for ( sal_uInt16 nPoolDefItem = EE_PARA_START; nPoolDefItem <= EE_CHAR_END; nPoolDefItem++) { const SfxPoolItem& rItem = aEditDoc.GetItemPool().GetDefaultItem( nPoolDefItem ); @@ -502,7 +502,7 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) sal_uInt16 nDefTabTwps = static_cast<sal_uInt16>(GetRefDevice()->LogicToLogic( Point( aEditDoc.GetDefTab(), 0 ), &GetRefMapMode(), &aTwpMode ).X()); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_DEFTAB ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_DEFTAB ); rOutput.WriteUInt32AsString( nDefTabTwps ); rOutput << endl; @@ -520,7 +520,7 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) if ( pNode->GetStyleSheet() ) { // Number of template - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_S ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_S ); sal_uInt32 nNumber = aStyleSheetToIdMap.find(pNode->GetStyleSheet())->second; rOutput.WriteUInt32AsString( nNumber ); @@ -643,11 +643,11 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) nIndex = nIndex + rTextPortion.GetLen(); } - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAR ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_PAR ).WriteOString( OOO_STRING_SVTOOLS_RTF_PARD ).WriteOString( OOO_STRING_SVTOOLS_RTF_PLAIN ); rOutput << endl; } // RTF-trailer ... - rOutput.WriteCharPtr( "}}" ); // 1xparentheses paragraphs, 1xparentheses RTF document + rOutput.WriteOString( "}}" ); // 1xparentheses paragraphs, 1xparentheses RTF document aFontTable.clear(); @@ -665,9 +665,9 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, { const SvxFrameDirectionItem& rWritingMode = static_cast<const SvxFrameDirectionItem&>(rItem); if ( rWritingMode.GetValue() == SvxFrameDirection::Horizontal_RL_TB ) - rOutput.WriteCharPtr( "\\rtlpar" ); + rOutput.WriteOString( "\\rtlpar" ); else - rOutput.WriteCharPtr( "\\ltrpar" ); + rOutput.WriteOString( "\\ltrpar" ); } break; case EE_PARA_OUTLLEVEL: @@ -675,7 +675,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_Int32 nLevel = static_cast<const SfxInt16Item&>(rItem).GetValue(); if( nLevel >= 0 ) { - rOutput.WriteCharPtr( "\\level" ); + rOutput.WriteOString( "\\level" ); rOutput.WriteInt32AsString( nLevel ); } } @@ -683,15 +683,15 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, case EE_PARA_OUTLLRSPACE: case EE_PARA_LRSPACE: { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FI ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_FI ); sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOffset(); nTxtFirst = LogicToTwips( nTxtFirst ); rOutput.WriteInt32AsString( nTxtFirst ); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LI ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_LI ); sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft()); nTxtLeft = static_cast<sal_uInt32>(LogicToTwips( nTxtLeft )); rOutput.WriteInt32AsString( nTxtLeft ); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RI ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_RI ); sal_uInt32 nTxtRight = static_cast<const SvxLRSpaceItem&>(rItem).GetRight(); nTxtRight = LogicToTwips( nTxtRight); rOutput.WriteUInt32AsString( nTxtRight ); @@ -699,11 +699,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, break; case EE_PARA_ULSPACE: { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SB ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_SB ); sal_uInt32 nUpper = static_cast<const SvxULSpaceItem&>(rItem).GetUpper(); nUpper = static_cast<sal_uInt32>(LogicToTwips( nUpper )); rOutput.WriteUInt32AsString( nUpper ); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SA ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_SA ); sal_uInt32 nLower = static_cast<const SvxULSpaceItem&>(rItem).GetLower(); nLower = LogicToTwips( nLower ); rOutput.WriteUInt32AsString( nLower ); @@ -711,7 +711,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, break; case EE_PARA_SBL: { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SL ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_SL ); sal_Int32 nVal = static_cast<const SvxLineSpacingItem&>(rItem).GetLineHeight(); char cMult = '0'; if ( static_cast<const SvxLineSpacingItem&>(rItem).GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop ) @@ -724,7 +724,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, cMult = '1'; } rOutput.WriteInt32AsString( nVal ); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SLMULT ).WriteChar( cMult ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_SLMULT ).WriteChar( cMult ); } break; case EE_PARA_JUST: @@ -732,11 +732,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, SvxAdjust eJustification = static_cast<const SvxAdjustItem&>(rItem).GetAdjust(); switch ( eJustification ) { - case SvxAdjust::Center: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QC ); + case SvxAdjust::Center: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_QC ); break; - case SvxAdjust::Right: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QR ); + case SvxAdjust::Right: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_QR ); break; - default: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QL ); + default: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_QL ); break; } } @@ -747,7 +747,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, for ( sal_uInt16 i = 0; i < rTabs.Count(); i++ ) { const SvxTabStop& rTab = rTabs[i]; - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TX ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_TX ); rOutput.WriteInt32AsString( LogicToTwips( rTab.GetTabPos() ) ); } } @@ -759,7 +759,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, static_cast<SvxColorItem const&>(rItem).GetValue()); assert(iter != rColorList.end()); sal_uInt32 const n = iter - rColorList.begin(); - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CF ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_CF ); rOutput.WriteUInt32AsString( n ); } break; @@ -777,7 +777,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, } } - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_F ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_F ); rOutput.WriteUInt32AsString( n ); } break; @@ -785,7 +785,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, case EE_CHAR_FONTHEIGHT_CJK: case EE_CHAR_FONTHEIGHT_CTL: { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FS ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_FS ); sal_Int32 nHeight = static_cast<const SvxFontHeightItem&>(rItem).GetHeight(); nHeight = LogicToTwips( nHeight ); // Twips => HalfPoints @@ -800,8 +800,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, FontWeight e = static_cast<const SvxWeightItem&>(rItem).GetWeight(); switch ( e ) { - case WEIGHT_BOLD: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B ); break; - default: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B ).WriteChar( '0' ); break; + case WEIGHT_BOLD: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_B ); break; + default: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_B ).WriteChar( '0' ); break; } } break; @@ -812,10 +812,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, FontLineStyle e = static_cast<const SvxUnderlineItem&>(rItem).GetLineStyle(); switch ( e ) { - case LINESTYLE_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULNONE ); break; - case LINESTYLE_SINGLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL ); break; - case LINESTYLE_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULDB ); break; - case LINESTYLE_DOTTED: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULD ); break; + case LINESTYLE_NONE: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_ULNONE ); break; + case LINESTYLE_SINGLE: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_UL ); break; + case LINESTYLE_DOUBLE: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_ULDB ); break; + case LINESTYLE_DOTTED: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_ULD ); break; default: break; } @@ -826,10 +826,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, FontLineStyle e = static_cast<const SvxOverlineItem&>(rItem).GetLineStyle(); switch ( e ) { - case LINESTYLE_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLNONE ); break; - case LINESTYLE_SINGLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OL ); break; - case LINESTYLE_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLDB ); break; - case LINESTYLE_DOTTED: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLD ); break; + case LINESTYLE_NONE: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_OLNONE ); break; + case LINESTYLE_SINGLE: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_OL ); break; + case LINESTYLE_DOUBLE: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_OLDB ); break; + case LINESTYLE_DOTTED: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_OLD ); break; default: break; } @@ -841,8 +841,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, switch ( e ) { case STRIKEOUT_SINGLE: - case STRIKEOUT_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STRIKE ); break; - case STRIKEOUT_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STRIKE ).WriteChar( '0' ); break; + case STRIKEOUT_DOUBLE: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_STRIKE ); break; + case STRIKEOUT_NONE: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_STRIKE ).WriteChar( '0' ); break; default: break; } @@ -856,8 +856,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, switch ( e ) { case ITALIC_OBLIQUE: - case ITALIC_NORMAL: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I ); break; - case ITALIC_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I ).WriteChar( '0' ); break; + case ITALIC_NORMAL: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_I ); break; + case ITALIC_NONE: rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_I ).WriteChar( '0' ); break; default: break; } @@ -865,7 +865,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, break; case EE_CHAR_OUTLINE: { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OUTL ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_OUTL ); if ( !static_cast<const SvxContourItem&>(rItem).GetValue() ) rOutput.WriteChar( '0' ); } @@ -874,49 +874,49 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, { FontRelief nRelief = static_cast<const SvxCharReliefItem&>(rItem).GetValue(); if ( nRelief == FontRelief::Embossed ) - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_EMBO ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_EMBO ); if ( nRelief == FontRelief::Engraved ) - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IMPR ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_IMPR ); } break; case EE_CHAR_EMPHASISMARK: { FontEmphasisMark nMark = static_cast<const SvxEmphasisMarkItem&>(rItem).GetEmphasisMark(); if ( nMark == FontEmphasisMark::NONE ) - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCNONE ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_ACCNONE ); else if ( nMark == (FontEmphasisMark::Accent | FontEmphasisMark::PosAbove) ) - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCCOMMA ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_ACCCOMMA ); else - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCDOT ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_ACCDOT ); } break; case EE_CHAR_SHADOW: { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHAD ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_SHAD ); if ( !static_cast<const SvxShadowedItem&>(rItem).GetValue() ) rOutput.WriteChar( '0' ); } break; case EE_FEATURE_TAB: { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TAB ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_TAB ); } break; case EE_FEATURE_LINEBR: { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SL ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_SL ); } break; case EE_CHAR_KERNING: { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_EXPNDTW ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_EXPNDTW ); rOutput.WriteInt32AsString( LogicToTwips( static_cast<const SvxKerningItem&>(rItem).GetValue() ) ); } break; case EE_CHAR_PAIRKERNING: { - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_KERNING ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_KERNING ); rOutput.WriteUInt32AsString( static_cast<const SvxAutoKernItem&>(rItem).GetValue() ? 1 : 0 ); } break; @@ -954,14 +954,14 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, // SWG: if ( nEsc ) { - rOutput.WriteCharPtr( "{\\*\\updnprop" ).WriteOString( OString::number( + rOutput.WriteOString( "{\\*\\updnprop" ).WriteOString( OString::number( nProp100) ).WriteChar( '}' ); } tools::Long nUpDown = nFontHeight * std::abs( nEsc ) / 100; if ( nEsc < 0 ) - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_DN ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_DN ); else if ( nEsc > 0 ) - rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UP ); + rOutput.WriteOString( OOO_STRING_SVTOOLS_RTF_UP ); rOutput.WriteOString( OString::number(nUpDown) ); } break; diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx index 73941dc4ec1d..71c3e0ff98eb 100644 --- a/filter/source/msfilter/rtfutil.cxx +++ b/filter/source/msfilter/rtfutil.cxx @@ -291,7 +291,7 @@ OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream, sa if (++nBreak == nLimit) { if (pStream) - pStream->WriteCharPtr(SAL_NEWLINE_STRING); + pStream->WriteOString(SAL_NEWLINE_STRING); else aRet.append(SAL_NEWLINE_STRING); nBreak = 0; diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index 872b42b391ed..6d9ed8d2fe03 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -27,14 +27,14 @@ void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab ) { while( nTab-- ) - rOutStm.WriteCharPtr( " " ); + rOutStm.WriteOString( " " ); } void SvMetaObject::WriteStars( SvStream & rOutStm ) { rOutStm.WriteChar( '/' ); for( int i = 6; i > 0; i-- ) - rOutStm.WriteCharPtr( "**********" ); + rOutStm.WriteOString( "**********" ); rOutStm.WriteChar( '/' ) << endl; } diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index ccee5c08f16c..8f207ca5ac04 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -266,19 +266,19 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) { WriteStars( rOutStm ); // define class - rOutStm.WriteCharPtr( "#ifdef ShellClass_" ).WriteOString( GetName() ) << endl; - rOutStm.WriteCharPtr( "#undef ShellClass" ) << endl; - rOutStm.WriteCharPtr( "#undef ShellClass_" ).WriteOString( GetName() ) << endl; - rOutStm.WriteCharPtr( "#define ShellClass " ).WriteOString( GetName() ) << endl; + rOutStm.WriteOString( "#ifdef ShellClass_" ).WriteOString( GetName() ) << endl; + rOutStm.WriteOString( "#undef ShellClass" ) << endl; + rOutStm.WriteOString( "#undef ShellClass_" ).WriteOString( GetName() ) << endl; + rOutStm.WriteOString( "#define ShellClass " ).WriteOString( GetName() ) << endl; // no slotmaps get written for interfaces if( GetMetaTypeType() != MetaTypeType::Shell ) { - rOutStm.WriteCharPtr( "#endif" ) << endl << endl; + rOutStm.WriteOString( "#endif" ) << endl << endl; return; } // write parameter array - rOutStm.WriteCharPtr("static SfxFormalArgument a").WriteOString(GetName()).WriteCharPtr("Args_Impl[] =") << endl; + rOutStm.WriteOString("static SfxFormalArgument a").WriteOString(GetName()).WriteOString("Args_Impl[] =") << endl; rOutStm.WriteChar('{') << endl; std::vector<sal_uInt32> aSuperList; @@ -301,10 +301,10 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) { // at least one dummy WriteTab( rOutStm, 1 ); - rOutStm.WriteCharPtr("{ (const SfxType*) &aSfxVoidItem_Impl, 0, 0 }" ) << endl; + rOutStm.WriteOString("{ (const SfxType*) &aSfxVoidItem_Impl, 0, 0 }" ) << endl; } rOutStm << endl; - rOutStm.WriteCharPtr( "};" ) << endl << endl; + rOutStm.WriteOString( "};" ) << endl << endl; std::vector<OString> aStringList; WriteSlotStubs( GetName(), aSlotList, aStringList, rOutStm ); @@ -313,7 +313,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) rOutStm << endl; // write slotmap - rOutStm.WriteCharPtr("static SfxSlot a").WriteOString(GetName()).WriteCharPtr("Slots_Impl[] =") << endl; + rOutStm.WriteOString("static SfxSlot a").WriteOString(GetName()).WriteOString("Slots_Impl[] =") << endl; rOutStm.WriteChar( '{' ) << endl; // write all attributes @@ -324,15 +324,15 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) { // at least one dummy WriteTab( rOutStm, 1 ); - rOutStm.WriteCharPtr( "SFX_SLOT_ARG(" ).WriteOString( GetName() ) - .WriteCharPtr( ", 0, SfxGroupId::NONE, " ) - .WriteCharPtr( "SFX_STUB_PTR_EXEC_NONE," ) - .WriteCharPtr( "SFX_STUB_PTR_STATE_NONE," ) - .WriteCharPtr( "SfxSlotMode::NONE, SfxVoidItem, 0, 0, \"\", SfxSlotMode::NONE )" ) << endl; + rOutStm.WriteOString( "SFX_SLOT_ARG(" ).WriteOString( GetName() ) + .WriteOString( ", 0, SfxGroupId::NONE, " ) + .WriteOString( "SFX_STUB_PTR_EXEC_NONE," ) + .WriteOString( "SFX_STUB_PTR_STATE_NONE," ) + .WriteOString( "SfxSlotMode::NONE, SfxVoidItem, 0, 0, \"\", SfxSlotMode::NONE )" ) << endl; } rOutStm << endl; - rOutStm.WriteCharPtr( "};" ) << endl; - rOutStm.WriteCharPtr( "#endif" ) << endl << endl; + rOutStm.WriteOString( "};" ) << endl; + rOutStm.WriteOString( "#endif" ) << endl << endl; for( size_t i = 0, n = aSlotList.size(); i < n; ++i ) { diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 7ff190141d6d..6b2d7640c077 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -353,7 +353,7 @@ void SvMetaSlot::WriteSlotStubs( std::string_view rShellName, if ( !bIn ) { rList.push_back( aMethodName ); - rOutStm.WriteCharPtr( "SFX_EXEC_STUB(" ) + rOutStm.WriteOString( "SFX_EXEC_STUB(" ) .WriteOString( rShellName ) .WriteChar( ',' ) .WriteOString( aMethodName ) @@ -378,7 +378,7 @@ void SvMetaSlot::WriteSlotStubs( std::string_view rShellName, if ( !bIn ) { rList.push_back( aMethodName ); - rOutStm.WriteCharPtr( "SFX_STATE_STUB(" ) + rOutStm.WriteOString( "SFX_STATE_STUB(" ) .WriteOString( rShellName ) .WriteChar( ',' ) .WriteOString( aMethodName ) @@ -392,13 +392,13 @@ void SvMetaSlot::WriteSlot( std::string_view rShellName, sal_uInt16 nCount, size_t nStart, SvIdlDataBase & rBase, SvStream & rOutStm ) { - rOutStm.WriteCharPtr( "// Slot Nr. " ) + rOutStm.WriteOString( "// Slot Nr. " ) .WriteOString( OString::number(nListPos) ) - .WriteCharPtr( " : " ); + .WriteOString( " : " ); OString aSlotIdValue(OString::number(GetSlotId().GetValue())); rOutStm.WriteOString( aSlotIdValue ) << endl; WriteTab( rOutStm, 1 ); - rOutStm.WriteCharPtr( "SFX_NEW_SLOT_ARG( " ).WriteOString( rShellName ).WriteChar( ',' ) ; + rOutStm.WriteOString( "SFX_NEW_SLOT_ARG( " ).WriteOString( rShellName ).WriteChar( ',' ) ; rOutStm.WriteOString( rSlotId ).WriteChar( ',' ); @@ -406,7 +406,7 @@ void SvMetaSlot::WriteSlot( std::string_view rShellName, sal_uInt16 nCount, if( !GetGroupId().isEmpty() ) rOutStm.WriteOString( GetGroupId() ); else - rOutStm.WriteCharPtr( "SfxGroupId::NONE" ); + rOutStm.WriteOString( "SfxGroupId::NONE" ); rOutStm.WriteChar( ',' ) << endl; WriteTab( rOutStm, 4 ); @@ -444,9 +444,9 @@ void SvMetaSlot::WriteSlot( std::string_view rShellName, sal_uInt16 nCount, assert(pNextSlot); - rOutStm.WriteCharPtr( "&a" ).WriteOString( rShellName ).WriteCharPtr( "Slots_Impl[" ) + rOutStm.WriteOString( "&a" ).WriteOString( rShellName ).WriteOString( "Slots_Impl[" ) .WriteOString( OString::number(pNextSlot->GetListPos()) ) - .WriteCharPtr( "] /*Offset Next*/, " ) << endl; + .WriteOString( "] /*Offset Next*/, " ) << endl; WriteTab( rOutStm, 4 ); @@ -454,22 +454,22 @@ void SvMetaSlot::WriteSlot( std::string_view rShellName, sal_uInt16 nCount, if( !GetExecMethod().isEmpty() && GetExecMethod() != "NoExec") { - rOutStm.WriteCharPtr( "SFX_STUB_PTR(" ).WriteOString( rShellName ).WriteChar( ',' ) + rOutStm.WriteOString( "SFX_STUB_PTR(" ).WriteOString( rShellName ).WriteChar( ',' ) .WriteOString( GetExecMethod() ).WriteChar( ')' ); } else - rOutStm.WriteCharPtr( "SFX_STUB_PTR_EXEC_NONE" ); + rOutStm.WriteOString( "SFX_STUB_PTR_EXEC_NONE" ); rOutStm.WriteChar( ',' ); // write StateMethod, with standard name if not specified if( !GetStateMethod().isEmpty() && GetStateMethod() != "NoState") { - rOutStm.WriteCharPtr( "SFX_STUB_PTR(" ).WriteOString( rShellName ).WriteChar( ',' ) + rOutStm.WriteOString( "SFX_STUB_PTR(" ).WriteOString( rShellName ).WriteChar( ',' ) .WriteOString( GetStateMethod() ).WriteChar( ')' ); } else - rOutStm.WriteCharPtr( "SFX_STUB_PTR_STATE_NONE" ); + rOutStm.WriteOString( "SFX_STUB_PTR_STATE_NONE" ); rOutStm.WriteChar( ',' ) << endl; WriteTab( rOutStm, 4 ); @@ -501,12 +501,12 @@ void SvMetaSlot::WriteSlot( std::string_view rShellName, sal_uInt16 nCount, rOutStm.WriteOString( MakeSlotName( SvHash_Container() ) ).WriteChar( '|' ); if ( GetReadOnlyDoc() ) rOutStm.WriteOString( MakeSlotName( SvHash_ReadOnlyDoc() ) ).WriteChar( '|' ); - rOutStm.WriteCharPtr( "SfxSlotMode::NONE" ); + rOutStm.WriteOString( "SfxSlotMode::NONE" ); rOutStm.WriteChar( ',' ) << endl; WriteTab( rOutStm, 4 ); if ( GetDisableFlags().isEmpty() ) - rOutStm.WriteCharPtr( "SfxDisableFlags::NONE" ); + rOutStm.WriteOString( "SfxDisableFlags::NONE" ); else rOutStm.WriteOString( GetDisableFlags() ); @@ -529,14 +529,14 @@ void SvMetaSlot::WriteSlot( std::string_view rShellName, sal_uInt16 nCount, rBase.aUsedTypes.push_back( pT ); } else - rOutStm.WriteCharPtr( "SfxVoidItem not defined" ); + rOutStm.WriteOString( "SfxVoidItem not defined" ); { rOutStm.WriteChar( ',' ) << endl; WriteTab( rOutStm, 4 ); rOutStm .WriteOString( OString::number(nCount) ) - .WriteCharPtr( "/*Offset*/, " ); + .WriteOString( "/*Offset*/, " ); if( IsMethod() ) { @@ -544,27 +544,27 @@ void SvMetaSlot::WriteSlot( std::string_view rShellName, sal_uInt16 nCount, size_t nSCount = pType->GetAttrCount(); rOutStm .WriteOString( OString::number(nSCount) ) - .WriteCharPtr( "/*Count*/," ); + .WriteOString( "/*Count*/," ); } else - rOutStm.WriteCharPtr( "0," ); + rOutStm.WriteOString( "0," ); - rOutStm.WriteCharPtr( " " ); + rOutStm.WriteOString( " " ); // Method/Property flags if( IsMethod() ) - rOutStm.WriteCharPtr( "SfxSlotMode::METHOD|" ); + rOutStm.WriteOString( "SfxSlotMode::METHOD|" ); - rOutStm.WriteCharPtr( "SfxSlotMode::NONE" ); + rOutStm.WriteOString( "SfxSlotMode::NONE" ); } { - rOutStm.WriteCharPtr( ",\"" ); + rOutStm.WriteOString( ",\"" ); rOutStm.WriteOString( GetName() ); - rOutStm.WriteCharPtr( "\"" ); + rOutStm.WriteOString( "\"" ); } - rOutStm.WriteCharPtr( " )," ) << endl; + rOutStm.WriteOString( " )," ) << endl; } sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm ) const @@ -584,13 +584,13 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO SvMetaAttribute * pPar = rList[n]; SvMetaType * pPType = pPar->GetType(); WriteTab( rOutStm, 1 ); - rOutStm.WriteCharPtr("{ (const SfxType*) &a") + rOutStm.WriteOString("{ (const SfxType*) &a") // item type - .WriteOString(pPType->GetName()).WriteCharPtr("_Impl, ") + .WriteOString(pPType->GetName()).WriteOString("_Impl, ") // parameter name - .WriteCharPtr("\"").WriteOString(pPar->GetName()).WriteCharPtr("\", ") + .WriteOString("\"").WriteOString(pPar->GetName()).WriteOString("\", ") // slot id - .WriteOString(pPar->GetSlotId().getString()).WriteCharPtr(" },") << endl; + .WriteOString(pPar->GetSlotId().getString()).WriteOString(" },") << endl; if( !SvIdlDataBase::FindType( pPType, rBase.aUsedTypes ) ) rBase.aUsedTypes.push_back( pPType ); } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 08492b4b6ddb..3af00c22cd0e 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -239,36 +239,36 @@ void SvMetaType::WriteSfxItem( bReturn = true; } - rOutStm.WriteCharPtr( "extern " ); + rOutStm.WriteOString( "extern " ); if (bExport) - rOutStm.WriteCharPtr( "SFX2_DLLPUBLIC " ); + rOutStm.WriteOString( "SFX2_DLLPUBLIC " ); rOutStm.WriteOString( aTypeName ) .WriteOString( aVarName ).WriteChar( ';' ) << endl; if (bReturn) return; // write the implementation part - rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl; - rOutStm.WriteCharPtr( "#if !defined(_WIN32) && (defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(EMSCRIPTEN) || defined(LINUX)))" ) << endl; - rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl; - rOutStm.WriteCharPtr( "#endif" ) << endl; + rOutStm.WriteOString( "#ifdef SFX_TYPEMAP" ) << endl; + rOutStm.WriteOString( "#if !defined(_WIN32) && (defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(EMSCRIPTEN) || defined(LINUX)))" ) << endl; + rOutStm.WriteOString( "__attribute__((__weak__))" ) << endl; + rOutStm.WriteOString( "#endif" ) << endl; rOutStm.WriteOString( aTypeName ).WriteOString( aVarName ) - .WriteCharPtr( " = " ) << endl; + .WriteOString( " = " ) << endl; rOutStm.WriteChar( '{' ) << endl; - rOutStm.WriteCharPtr( "\tcreateSfxPoolItem<" ).WriteOString( rItemName ) - .WriteCharPtr(">, &typeid(").WriteOString( rItemName ).WriteCharPtr( "), " ); + rOutStm.WriteOString( "\tcreateSfxPoolItem<" ).WriteOString( rItemName ) + .WriteOString(">, &typeid(").WriteOString( rItemName ).WriteOString( "), " ); rOutStm.WriteOString( aAttrCount ); if( nAttrCount ) { - rOutStm.WriteCharPtr( ", { " ); + rOutStm.WriteOString( ", { " ); // write the single attributes - rOutStm.WriteCharPtr( aAttrArray.getStr() ); - rOutStm.WriteCharPtr( " }" ); + rOutStm.WriteOString( aAttrArray ); + rOutStm.WriteOString( " }" ); } rOutStm << endl; - rOutStm.WriteCharPtr( "};" ) << endl; - rOutStm.WriteCharPtr( "#endif" ) << endl << endl; + rOutStm.WriteOString( "};" ) << endl; + rOutStm.WriteOString( "#endif" ) << endl << endl; } void SvMetaType::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 229696b021ec..699d90e0f913 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -519,7 +519,7 @@ struct WriteDep explicit WriteDep(SvFileStream & rStream) : m_rStream(rStream) { } void operator() (std::u16string_view rItem) { - m_rStream.WriteCharPtr( " \\\n " ); + m_rStream.WriteOString( " \\\n " ); m_rStream.WriteOString( OUStringToOString(rItem, RTL_TEXTENCODING_UTF8) ); } }; @@ -533,7 +533,7 @@ struct WriteDummy void operator() (std::u16string_view rItem) { m_rStream.WriteOString( OUStringToOString(rItem, RTL_TEXTENCODING_UTF8) ); - m_rStream.WriteCharPtr( " :\n\n" ); + m_rStream.WriteOString( " :\n\n" ); } }; @@ -543,9 +543,9 @@ void SvIdlDataBase::WriteDepFile( SvFileStream & rStream, std::u16string_view rTarget) { rStream.WriteOString( OUStringToOString(rTarget, RTL_TEXTENCODING_UTF8) ); - rStream.WriteCharPtr( " :" ); + rStream.WriteOString( " :" ); ::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDep(rStream)); - rStream.WriteCharPtr( "\n\n" ); + rStream.WriteOString( "\n\n" ); ::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDummy(rStream)); } diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 253ba11c87f0..2072aeff4451 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -260,7 +260,6 @@ public: SvStream& WriteUChar( unsigned char nChar ); SvStream& WriteFloat( float nFloat ); SvStream& WriteDouble( const double& rDouble ); - SvStream& WriteCharPtr( const char* pBuf ); SvStream& WriteUInt32AsString( sal_uInt32 nUInt32 ); SvStream& WriteInt32AsString( sal_Int32 nInt32 ); diff --git a/opencl/source/opencl_device.cxx b/opencl/source/opencl_device.cxx index e8712cb5a745..10c3103d3631 100644 --- a/opencl/source/opencl_device.cxx +++ b/opencl/source/opencl_device.cxx @@ -436,7 +436,7 @@ public: void log(std::string_view rKey, std::string_view rValue) { maStream.WriteOString(rKey); - maStream.WriteCharPtr(": "); + maStream.WriteOString(": "); maStream.WriteOString(rValue); maStream.WriteChar('\n'); } 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: */ diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index e5cf1951b4f4..37e41a594aec 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2959,7 +2959,7 @@ bool HtmlExport::CreateImageNumberFile() ErrCode nErr = aFile.createStream(aFull, pStr); if(nErr == ERRCODE_NONE) { - pStr->WriteCharPtr( "1" ); + pStr->WriteOString( "1" ); aFile.close(); } diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 5c8f4b5351f3..cbfd142856ea 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -55,9 +55,9 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, bool bHTTPEquiv, OUString *pNonConvertableChars ) { - rStrm.WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( SAL_NEWLINE_STRING ); if( pIndent ) - rStrm.WriteCharPtr( pIndent ); + rStrm.WriteOString( pIndent ); OStringBuffer sOut; sOut.append("<" OOO_STRING_SVTOOLS_HTML_meta " ") @@ -71,7 +71,7 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, rStrm.WriteOString( sOut ); sOut.setLength(0); - HTMLOutFuncs::Out_String( rStrm, rContent, pNonConvertableChars ).WriteCharPtr( "\"/>" ); + HTMLOutFuncs::Out_String( rStrm, rContent, pNonConvertableChars ).WriteOString( "\"/>" ); } void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, @@ -83,9 +83,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, pNonConvertableChars ); // Title (regardless if empty) - rStrm.WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( SAL_NEWLINE_STRING ); if( pIndent ) - rStrm.WriteCharPtr( pIndent ); + rStrm.WriteOString( pIndent ); HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title ); if( i_xDocProps.is() ) { @@ -101,14 +101,14 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, const OUString& rTarget = i_xDocProps->getDefaultTarget(); if( !rTarget.isEmpty() ) { - rStrm.WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( SAL_NEWLINE_STRING ); if( pIndent ) - rStrm.WriteCharPtr( pIndent ); + rStrm.WriteOString( pIndent ); rStrm.WriteOString( "<" OOO_STRING_SVTOOLS_HTML_base " " OOO_STRING_SVTOOLS_HTML_O_target "=\"" ); HTMLOutFuncs::Out_String( rStrm, rTarget, pNonConvertableChars ) - .WriteCharPtr( "\">" ); + .WriteOString( "\">" ); } } diff --git a/svtools/source/svhtml/HtmlWriter.cxx b/svtools/source/svhtml/HtmlWriter.cxx index 8f99e3b29110..3409461d363c 100644 --- a/svtools/source/svhtml/HtmlWriter.cxx +++ b/svtools/source/svhtml/HtmlWriter.cxx @@ -48,7 +48,7 @@ void HtmlWriter::start(const OString& aElement) { for(size_t i = 0; i < maElementStack.size() - 1; i++) { - mrStream.WriteCharPtr(" "); + mrStream.WriteOString(" "); } } @@ -67,9 +67,9 @@ void HtmlWriter::endAttribute() { if (mbElementOpen) { - mrStream.WriteCharPtr("/>"); + mrStream.WriteOString("/>"); if (mbPrettyPrint) - mrStream.WriteCharPtr("\n"); + mrStream.WriteOString("\n"); mbElementOpen = false; } } @@ -94,9 +94,9 @@ void HtmlWriter::end() { if (mbElementOpen && !mbCharactersWritten) { - mrStream.WriteCharPtr("/>"); + mrStream.WriteOString("/>"); if (mbPrettyPrint) - mrStream.WriteCharPtr("\n"); + mrStream.WriteOString("\n"); } else { @@ -104,14 +104,14 @@ void HtmlWriter::end() { for(size_t i = 0; i < maElementStack.size() - 1; i++) { - mrStream.WriteCharPtr(" "); + mrStream.WriteOString(" "); } } - mrStream.WriteCharPtr("</"); + mrStream.WriteOString("</"); mrStream.WriteOString(Concat2View(maNamespace + maElementStack.back())); - mrStream.WriteCharPtr(">"); + mrStream.WriteOString(">"); if (mbPrettyPrint) - mrStream.WriteCharPtr("\n"); + mrStream.WriteOString("\n"); } maElementStack.pop_back(); mbElementOpen = false; @@ -168,7 +168,7 @@ void HtmlWriter::attribute(std::string_view aAttribute) void HtmlWriter::characters(std::string_view rChars) { if (!mbCharactersWritten) - mrStream.WriteCharPtr(">"); + mrStream.WriteOString(">"); mrStream.WriteOString(rChars); mbCharactersWritten = true; } diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index ca107cb0b016..1c2856050d0f 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -510,9 +510,9 @@ SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, std::string_view rStr, bool bOn ) { if(bOn) - rStream.WriteCharPtr("<"); + rStream.WriteOString("<"); else - rStream.WriteCharPtr("</"); + rStream.WriteOString("</"); rStream.WriteOString(rStr).WriteChar('>'); @@ -565,19 +565,19 @@ SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uInt32 nHex, sal_uInt8 n *pStr += 39; nHex >>= 4; } - return rStream.WriteCharPtr( pStr ); + return rStream.WriteOString( pStr ); } SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor, bool bXHTML ) { - rStream.WriteCharPtr( "\"" ); + rStream.WriteOString( "\"" ); if (bXHTML) - rStream.WriteCharPtr( "color: " ); - rStream.WriteCharPtr( "#" ); + rStream.WriteOString( "color: " ); + rStream.WriteOString( "#" ); if( rColor == COL_AUTO ) { - rStream.WriteCharPtr( "000000" ); + rStream.WriteOString( "000000" ); } else { @@ -614,7 +614,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, rStream.WriteOString( sOut ); sOut.setLength(0); Out_String( rStream, rOutName ); - rStream.WriteCharPtr( "\">" ); + rStream.WriteOString( "\">" ); for( size_t i=0; i<rIMap.GetIMapObjectCount(); i++ ) { @@ -695,9 +695,9 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, if( pShape ) { if( pDelim ) - rStream.WriteCharPtr( pDelim ); + rStream.WriteOString( pDelim ); if( pIndentArea ) - rStream.WriteCharPtr( pIndentArea ); + rStream.WriteOString( pIndentArea ); sOut.append(OString::Concat("<") + OOO_STRING_SVTOOLS_HTML_area " " OOO_STRING_SVTOOLS_HTML_O_shape @@ -718,7 +718,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, Out_String( rStream, aURL ).WriteChar( '\"' ); } else - rStream.WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_nohref ); + rStream.WriteOString( OOO_STRING_SVTOOLS_HTML_O_nohref ); const OUString& rObjName = pObj->GetName(); if( !rObjName.isEmpty() ) @@ -762,9 +762,9 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, } if( pDelim ) - rStream.WriteCharPtr( pDelim ); + rStream.WriteOString( pDelim ); if( pIndentMap ) - rStream.WriteCharPtr( pIndentMap ); + rStream.WriteOString( pIndentMap ); Out_AsciiTag( rStream, OOO_STRING_SVTOOLS_HTML_map, false ); return rStream; @@ -825,12 +825,12 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, if( !rSource.empty() || pSBLibrary || pSBModule ) { - rStrm.WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( SAL_NEWLINE_STRING ); if( JAVASCRIPT != eScriptType ) { - rStrm.WriteCharPtr( "<!--" ) - .WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( "<!--" ) + .WriteOString( SAL_NEWLINE_STRING ); } if( STARBASIC == eScriptType ) @@ -839,7 +839,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, { sOut.append("' " OOO_STRING_SVTOOLS_HTML_SB_library " " + OUStringToOString(*pSBLibrary, RTL_TEXTENCODING_UTF8)); - rStrm.WriteOString( sOut ).WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( sOut ).WriteOString( SAL_NEWLINE_STRING ); sOut.setLength(0); } @@ -847,7 +847,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, { sOut.append("' " OOO_STRING_SVTOOLS_HTML_SB_module " " + OUStringToOString(*pSBModule, RTL_TEXTENCODING_UTF8)); - rStrm.WriteOString( sOut ).WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( sOut ).WriteOString( SAL_NEWLINE_STRING ); sOut.setLength(0); } } @@ -857,16 +857,16 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, // we write the module in ANSI-charset, but with // the system new line. const OString sSource(OUStringToOString(rSource, RTL_TEXTENCODING_UTF8)); - rStrm.WriteOString( sSource ).WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( sSource ).WriteOString( SAL_NEWLINE_STRING ); } - rStrm.WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( SAL_NEWLINE_STRING ); if( JAVASCRIPT != eScriptType ) { // MIB/MM: if it is not StarBasic, a // could be wrong. // As the comment is removed during reading, it is not helping us... - rStrm.WriteCharPtr( STARBASIC == eScriptType ? "' -->" : "// -->" ) - .WriteCharPtr( SAL_NEWLINE_STRING ); + rStrm.WriteOString( STARBASIC == eScriptType ? "' -->" : "// -->" ) + .WriteOString( SAL_NEWLINE_STRING ); } } diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index e66e66d840bb..4b4c35ae01a8 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -43,7 +43,7 @@ SvStream& Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen ) *pStr += 39; nHex >>= 4; } - return rStream.WriteCharPtr( pStr ); + return rStream.WriteOString( pStr ); } // Ideally, this function should work on (sal_uInt32) Unicode scalar values @@ -69,13 +69,13 @@ SvStream& Out_Char(SvStream& rStream, sal_Unicode c, // written break; case 0xA0: - rStream.WriteCharPtr( "\\~" ); + rStream.WriteOString( "\\~" ); break; case 0xAD: - rStream.WriteCharPtr( "\\-" ); + rStream.WriteOString( "\\-" ); break; case 0x2011: - rStream.WriteCharPtr( "\\_" ); + rStream.WriteOString( "\\_" ); break; case '\n': pStr = OOO_STRING_SVTOOLS_RTF_LINE; @@ -150,17 +150,17 @@ SvStream& Out_Char(SvStream& rStream, sal_Unicode c, { // #i47831# add an additional whitespace, so that // "document whitespaces" are not ignored.; - rStream.WriteCharPtr( "\\uc" ) - .WriteOString( OString::number(nLen) ).WriteCharPtr( " " ); + rStream.WriteOString( "\\uc" ) + .WriteOString( OString::number(nLen) ).WriteOString( " " ); *pUCMode = nLen; } - rStream.WriteCharPtr( "\\u" ) + rStream.WriteOString( "\\u" ) .WriteInt32AsString(c); } for (sal_Int32 nI = 0; nI < nLen; ++nI) { - rStream.WriteCharPtr( "\\'" ); + rStream.WriteOString( "\\'" ); Out_Hex(rStream, sConverted[nI], 2); } } @@ -170,7 +170,7 @@ SvStream& Out_Char(SvStream& rStream, sal_Unicode c, } if (pStr) - rStream.WriteCharPtr( pStr ).WriteChar( ' ' ); + rStream.WriteOString( pStr ).WriteChar( ' ' ); return rStream; } @@ -184,7 +184,7 @@ SvStream& RTFOutFuncs::Out_String( SvStream& rStream, std::u16string_view rStr, for (size_t n = 0; n < rStr.size(); ++n) Out_Char(rStream, rStr[n], &nUCMode, eDestEnc); if (nUCMode != 1) - rStream.WriteCharPtr( "\\uc1" ).WriteCharPtr( " " ); // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.; + rStream.WriteOString( "\\uc1" ).WriteOString( " " ); // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.; return rStream; } diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 90853207c8f9..6e571bea4e10 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -79,8 +79,8 @@ SdrTableRtfExporter::SdrTableRtfExporter( SvStream& rStrm, SdrTableObj& rObj ) void SdrTableRtfExporter::Write() { - mrStrm.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF ); - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING ); + mrStrm.WriteChar( '{' ).WriteOString( OOO_STRING_SVTOOLS_RTF_RTF ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteOString( SAL_NEWLINE_STRING ); Reference< XTableColumns > xColumns( mxTable->getColumns() ); const sal_Int32 nColCount = xColumns->getCount(); @@ -117,7 +117,7 @@ void SdrTableRtfExporter::Write() TOOLS_WARN_EXCEPTION("svx", ""); } - mrStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING ); + mrStrm.WriteChar( '}' ).WriteOString( SAL_NEWLINE_STRING ); } void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sal_Int32 nRow, const std::vector< sal_Int32 >& aColumnStart ) @@ -125,8 +125,8 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa sal_Int32 nRowHeight = 0; 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 ).WriteOString( OString::number(nRowHeight) ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteOString( OOO_STRING_SVTOOLS_RTF_TRGAPH ).WriteOString( "30" ).WriteOString( OOO_STRING_SVTOOLS_RTF_TRLEFT ).WriteOString( "-30" ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_TRRH ).WriteOString( OString::number(nRowHeight) ); const sal_Int32 nColCount = mxTable->getColumnCount(); for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) @@ -136,11 +136,11 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa if( !xCell.is() ) continue; - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteOString( OString::number(aColumnStart[nCol]) ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteOString( OString::number(aColumnStart[nCol]) ); if ( (nCol & 0x0F) == 0x0F ) - mrStrm.WriteCharPtr( SAL_NEWLINE_STRING ); // prevent long lines + mrStrm.WriteOString( SAL_NEWLINE_STRING ); // prevent long lines } - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL ).WriteCharPtr( SAL_NEWLINE_STRING ); + mrStrm.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 = mrStrm.Tell(); for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) @@ -148,11 +148,11 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa WriteCell( nCol, nRow ); if ( mrStrm.Tell() - nStrmPos > 255 ) { - mrStrm.WriteCharPtr( SAL_NEWLINE_STRING ); + mrStrm.WriteOString( SAL_NEWLINE_STRING ); nStrmPos = mrStrm.Tell(); } } - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW ).WriteCharPtr( SAL_NEWLINE_STRING ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_ROW ).WriteOString( SAL_NEWLINE_STRING ); } @@ -162,7 +162,7 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow ) if( !xCell.is() || xCell->isMerged() ) { - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_CELL ); return ; } @@ -204,30 +204,30 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow ) case SDRTEXTHORZADJUST_LEFT: default: pChar = OOO_STRING_SVTOOLS_RTF_QL; break; } - mrStrm.WriteCharPtr( pChar ); + mrStrm.WriteOString( pChar ); if ( rWeightItem.GetWeight() >= WEIGHT_BOLD ) { // bold bResetAttr = true; - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_B ); } if ( rPostureItem.GetPosture() != ITALIC_NONE ) { // italic bResetAttr = true; - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_I ); } if ( rUnderlineItem.GetLineStyle() != LINESTYLE_NONE ) { // underline bResetAttr = true; - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_UL ); } mrStrm.WriteChar( ' ' ); RTFOutFuncs::Out_String( mrStrm, aContent ); - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_CELL ); if ( bResetAttr ) - mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN ); + mrStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_PLAIN ); } } diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx index 823148151377..a5d32101068a 100644 --- a/sw/qa/unit/swmodeltestbase.cxx +++ b/sw/qa/unit/swmodeltestbase.cxx @@ -624,10 +624,10 @@ SwDocShell* SwModelTestBase::getSwDocShell() void SwModelTestBase::WrapReqifFromTempFile(SvMemoryStream& rStream) { - rStream.WriteCharPtr("<reqif-xhtml:html xmlns:reqif-xhtml=\"http://www.w3.org/1999/xhtml\">\n"); + rStream.WriteOString("<reqif-xhtml:html xmlns:reqif-xhtml=\"http://www.w3.org/1999/xhtml\">\n"); SvFileStream aFileStream(maTempFile.GetURL(), StreamMode::READ); rStream.WriteStream(aFileStream); - rStream.WriteCharPtr("</reqif-xhtml:html>\n"); + rStream.WriteOString("</reqif-xhtml:html>\n"); rStream.Seek(0); } diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx index 4a25b8b22742..97e9683a59ab 100644 --- a/sw/source/core/bastyp/swrect.cxx +++ b/sw/source/core/bastyp/swrect.cxx @@ -192,7 +192,7 @@ SvStream& WriteSwRect(SvStream &rStream, const SwRect &rRect) WriteChar('/').WriteInt32(rRect.Left()). WriteChar(',').WriteInt32(rRect.Width()). WriteChar('x').WriteInt32(rRect.Height()). - WriteCharPtr("] "); + WriteOString("] "); return rStream; } #endif diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 99fffb76d6b3..349891c0eb92 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1692,12 +1692,12 @@ static SwHTMLWriter& OutCSS1_SwPageDesc( SwHTMLWriter& rWrt, const SwPageDesc& r { rWrt.OutNewLine(); OString sTmp(OUStringToOString(aSelector, RTL_TEXTENCODING_UTF8)); - rWrt.Strm().WriteOString( sTmp ).WriteCharPtr( " {" ); + rWrt.Strm().WriteOString( sTmp ).WriteOString( " {" ); rWrt.m_bFirstCSS1Property = false; } if( !rWrt.m_bFirstCSS1Property ) - rWrt.Strm().WriteCharPtr( sCSS1_rule_end ); + rWrt.Strm().WriteOString( sCSS1_rule_end ); return rWrt; } @@ -1716,7 +1716,7 @@ static SwHTMLWriter& OutCSS1_SwFootnoteInfo( SwHTMLWriter& rWrt, const SwEndNote &aSelector ); rWrt.OutCSS1_PropertyAscii( sCSS1_P_font_size, sHTML_FTN_fontheight ); - rWrt.Strm().WriteCharPtr( sCSS1_rule_end ); + rWrt.Strm().WriteOString( sCSS1_rule_end ); } const SwCharFormat *pSymCharFormat = rInfo.GetCharFormat( *pDoc ); @@ -2761,7 +2761,7 @@ static void OutCSS1_SwFormatDropAttrs( SwHTMLWriter& rHWrt, else if( pDCCharFormat ) rHWrt.OutCSS1_SfxItemSet( pDCCharFormat->GetAttrSet() ); else if( (rHWrt.m_nCSS1OutMode & CSS1_OUTMODE_ANY_OFF) == CSS1_OUTMODE_RULE_OFF ) - rHWrt.Strm().WriteCharPtr( sCSS1_rule_end ); + rHWrt.Strm().WriteOString( sCSS1_rule_end ); } @@ -3664,7 +3664,7 @@ SwHTMLWriter& OutCSS1_HintSpanTag( SwHTMLWriter& rWrt, const SfxPoolItem& rHt ) Out( aCSS1AttrFnTab, rHt, rWrt ); if( !rWrt.m_bFirstCSS1Property && rWrt.m_bTagOn ) - rWrt.Strm().WriteCharPtr( sCSS1_span_tag_end ); + rWrt.Strm().WriteOString( sCSS1_span_tag_end ); return rWrt; } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 5d9fb561de98..7ca9b0172cfc 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -613,7 +613,7 @@ static void OutHTML_SwFormat( SwHTMLWriter& rWrt, const SwFormat& rFormat, // output a line break (without indentation) at the beginning of the // paragraph, only rInfo.aToken.clear(); // don't output an end tag - rWrt.Strm().WriteCharPtr( SAL_NEWLINE_STRING ); + rWrt.Strm().WriteOString( SAL_NEWLINE_STRING ); return; } @@ -2496,7 +2496,7 @@ SwHTMLWriter& OutHTML_SwTextNode( SwHTMLWriter& rWrt, const SwContentNode& rNode // be used as a replacement. for (sal_Int32 i = 0; i < *rWrt.m_nLeadingTabWidth; ++i) { - rWrt.Strm().WriteCharPtr(" "); + rWrt.Strm().WriteOString(" "); } bConsumed = true; } @@ -2548,7 +2548,7 @@ SwHTMLWriter& OutHTML_SwTextNode( SwHTMLWriter& rWrt, const SwContentNode& rNode { // If the last paragraph of a table cell is empty and we export // for the MS-IE, we write a instead of a <BR> - rWrt.Strm().WriteChar( '&' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_S_nbsp ).WriteChar( ';' ); + rWrt.Strm().WriteChar( '&' ).WriteOString( OOO_STRING_SVTOOLS_HTML_S_nbsp ).WriteChar( ';' ); } else { @@ -2727,7 +2727,7 @@ static SwHTMLWriter& OutHTML_SvxFont( SwHTMLWriter& rWrt, const SfxPoolItem& rHt " " OOO_STRING_SVTOOLS_HTML_O_style "=\"font-family: "; rWrt.Strm().WriteOString(sOut); HTMLOutFuncs::Out_String(rWrt.Strm(), aNames) - .WriteCharPtr("\">"); + .WriteOString("\">"); } else { @@ -2735,7 +2735,7 @@ static SwHTMLWriter& OutHTML_SvxFont( SwHTMLWriter& rWrt, const SfxPoolItem& rHt OOO_STRING_SVTOOLS_HTML_O_face "=\""; rWrt.Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( rWrt.Strm(), aNames ) - .WriteCharPtr( "\">" ); + .WriteOString( "\">" ); } } else @@ -3056,7 +3056,7 @@ SwHTMLWriter& OutHTML_INetFormat( SwHTMLWriter& rWrt, const SwFormatINetFormat& if( bEvents ) HTMLOutFuncs::Out_Events( rWrt.Strm(), *pMacTable, aAnchorEventTable, rWrt.m_bCfgStarBasic ); - rWrt.Strm().WriteCharPtr( ">" ); + rWrt.Strm().WriteOString( ">" ); return rWrt; } diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index e8a380efd78f..3500a631f108 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -285,11 +285,11 @@ void SwHTMLWriter::OutBasic(const SwHTMLWriter & rHTMLWrt) Strm().WriteOString( sOut ); // Entities aren't welcome here Strm().WriteOString( OUStringToOString(sLang, RTL_TEXTENCODING_UTF8) ) - .WriteCharPtr( "\">" ); + .WriteOString( "\">" ); } const OUString& rModName = pModule->GetName(); - Strm().WriteCharPtr( SAL_NEWLINE_STRING ); // don't indent! + Strm().WriteOString( SAL_NEWLINE_STRING ); // don't indent! HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource32(), sLang, STARBASIC, OUString(), &rLibName, &rModName ); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 8d39d85cbbbb..67c213c4d331 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -1233,7 +1233,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, while ( nPos != -1 ) { if( nPos ) - rWrt.Strm().WriteCharPtr( SAL_NEWLINE_STRING ); + rWrt.Strm().WriteOString( SAL_NEWLINE_STRING ); OUString aLine = sVal.getToken( 0, 0x0A, nPos ); HTMLOutFuncs::Out_String( rWrt.Strm(), aLine ); } diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 0f8b15ed4185..10b909d1df41 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -362,7 +362,7 @@ void SwHTMLWriter::OutFootEndNotes() " " OOO_STRING_SVTOOLS_HTML_O_id "=\""; Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( Strm(), sFootnoteName ); - Strm().WriteCharPtr( "\">" ); + Strm().WriteOString( "\">" ); m_bLFPossible = true; IncIndentLevel(); // indent content of <DIV> @@ -542,7 +542,7 @@ static void lcl_html_outFootEndNoteInfo( SwHTMLWriter& rWrt, OUString const *pPa "\" " OOO_STRING_SVTOOLS_HTML_O_content "=\""; rWrt.Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( rWrt.Strm(), aContent.makeStringAndClear() ); - rWrt.Strm().WriteCharPtr( "\">" ); + rWrt.Strm().WriteOString( "\">" ); } void SwHTMLWriter::OutFootEndNoteInfo() diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 83c047ef2603..9bb4b2743552 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -1406,7 +1406,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma const OUString& rValue = rCommand.GetArgument(); rWrt.Strm().WriteChar( ' ' ); HTMLOutFuncs::Out_String( rWrt.Strm(), rName ); - rWrt.Strm().WriteCharPtr( "=\"" ); + rWrt.Strm().WriteOString( "=\"" ); HTMLOutFuncs::Out_String( rWrt.Strm(), rValue ).WriteChar( '\"' ); } else if( SwHtmlOptType::PARAM == nType ) @@ -1436,7 +1436,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma sOut.append("\" " OOO_STRING_SVTOOLS_HTML_O_value "=\""); rWrt.Strm().WriteOString( sOut ); sOut.setLength(0); - HTMLOutFuncs::Out_String( rWrt.Strm(), rValue ).WriteCharPtr( "\">" ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rValue ).WriteOString( "\">" ); } rWrt.DecIndentLevel(); // indent the applet content @@ -1464,7 +1464,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma const OUString& rValue = rCommand.GetArgument(); rWrt.Strm().WriteChar( ' ' ); HTMLOutFuncs::Out_String( rWrt.Strm(), rName ); - rWrt.Strm().WriteCharPtr( "=\"" ); + rWrt.Strm().WriteOString( "=\"" ); HTMLOutFuncs::Out_String( rWrt.Strm(), rValue ).WriteChar( '\"' ); } } diff --git a/sw/source/filter/html/htmlreqifreader.cxx b/sw/source/filter/html/htmlreqifreader.cxx index 0387bb39447f..f42c87e3e176 100644 --- a/sw/source/filter/html/htmlreqifreader.cxx +++ b/sw/source/filter/html/htmlreqifreader.cxx @@ -358,31 +358,31 @@ void WrapOleGraphicInRtf(SvStream& rRtf, sal_uInt32 nWidth, sal_uInt32 nHeight, const sal_uInt8* pPresentationData, sal_uInt64 nPresentationData) { // Start result. - rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_RESULT); + rRtf.WriteOString("{" OOO_STRING_SVTOOLS_RTF_RESULT); // Start pict. - rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_PICT); + rRtf.WriteOString("{" OOO_STRING_SVTOOLS_RTF_PICT); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_WMETAFILE "8"); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICW); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_WMETAFILE "8"); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_PICW); rRtf.WriteOString(OString::number(nWidth)); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICH); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_PICH); rRtf.WriteOString(OString::number(nHeight)); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICWGOAL); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_PICWGOAL); rRtf.WriteOString(OString::number(nWidth)); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICHGOAL); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_PICHGOAL); rRtf.WriteOString(OString::number(nHeight)); if (pPresentationData) { - rRtf.WriteCharPtr(SAL_NEWLINE_STRING); + rRtf.WriteOString(SAL_NEWLINE_STRING); msfilter::rtfutil::WriteHex(pPresentationData, nPresentationData, &rRtf); } // End pict. - rRtf.WriteCharPtr("}"); + rRtf.WriteOString("}"); // End result. - rRtf.WriteCharPtr("}"); + rRtf.WriteOString("}"); } } @@ -462,28 +462,28 @@ bool WrapOleInRtf(SvStream& rOle2, SvStream& rRtf, SwOLENode& rOLENode, pPresentationData, nPresentationData); // Start object. - rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_OBJECT); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_OBJEMB); + rRtf.WriteOString("{" OOO_STRING_SVTOOLS_RTF_OBJECT); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_OBJEMB); // Start objclass. - rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_OBJCLASS " "); + rRtf.WriteOString("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_OBJCLASS " "); rRtf.WriteOString(aClassName); // End objclass. - rRtf.WriteCharPtr("}"); + rRtf.WriteOString("}"); // Object size. - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_OBJW); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_OBJW); rRtf.WriteOString(OString::number(nWidth)); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_OBJH); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_OBJH); rRtf.WriteOString(OString::number(nHeight)); // Start objdata. - rRtf.WriteCharPtr( + rRtf.WriteOString( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_OBJDATA SAL_NEWLINE_STRING); msfilter::rtfutil::WriteHex(static_cast<const sal_uInt8*>(aOLE1.GetData()), aOLE1.GetSize(), &rRtf); // End objdata. - rRtf.WriteCharPtr("}"); + rRtf.WriteOString("}"); if (pPresentationData) { @@ -491,7 +491,7 @@ bool WrapOleInRtf(SvStream& rOle2, SvStream& rRtf, SwOLENode& rOLENode, } // End object. - rRtf.WriteCharPtr("}"); + rRtf.WriteOString("}"); return true; } @@ -499,29 +499,29 @@ bool WrapOleInRtf(SvStream& rOle2, SvStream& rRtf, SwOLENode& rOLENode, bool WrapGraphicInRtf(const Graphic& rGraphic, const SwFrameFormat& rFormat, SvStream& rRtf) { // Start object. - rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_OBJECT); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_OBJEMB); + rRtf.WriteOString("{" OOO_STRING_SVTOOLS_RTF_OBJECT); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_OBJEMB); // Object size: as used in the document model (not pixel size) Size aSize = rFormat.GetFrameSize().GetSize(); sal_uInt32 nWidth = aSize.getWidth(); sal_uInt32 nHeight = aSize.getHeight(); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_OBJW); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_OBJW); rRtf.WriteOString(OString::number(nWidth)); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_OBJH); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_OBJH); rRtf.WriteOString(OString::number(nHeight)); rRtf.WriteOString(SAL_NEWLINE_STRING); // Start objclass. - rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_OBJCLASS " "); + rRtf.WriteOString("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_OBJCLASS " "); OString aClassName("PBrush"); rRtf.WriteOString(aClassName); // End objclass. - rRtf.WriteCharPtr("}"); + rRtf.WriteOString("}"); rRtf.WriteOString(SAL_NEWLINE_STRING); // Start objdata. - rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_OBJDATA " "); + rRtf.WriteOString("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_OBJDATA " "); SvMemoryStream aOle1; // Write ObjectHeader, see [MS-OLEDS] 2.2.4. @@ -612,23 +612,23 @@ bool WrapGraphicInRtf(const Graphic& rGraphic, const SwFrameFormat& rFormat, SvS // End objdata. msfilter::rtfutil::WriteHex(static_cast<const sal_uInt8*>(aOle1.GetData()), aOle1.GetSize(), &rRtf); - rRtf.WriteCharPtr("}"); + rRtf.WriteOString("}"); rRtf.WriteOString(SAL_NEWLINE_STRING); - rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_RESULT); - rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_PICT); + rRtf.WriteOString("{" OOO_STRING_SVTOOLS_RTF_RESULT); + rRtf.WriteOString("{" OOO_STRING_SVTOOLS_RTF_PICT); Size aMapped(rGraphic.GetPrefSize()); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICW); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_PICW); rRtf.WriteOString(OString::number(aMapped.Width())); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICH); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_PICH); rRtf.WriteOString(OString::number(aMapped.Height())); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICWGOAL); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_PICWGOAL); rRtf.WriteOString(OString::number(nWidth)); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICHGOAL); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_PICHGOAL); rRtf.WriteOString(OString::number(nHeight)); - rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_WMETAFILE "8"); + rRtf.WriteOString(OOO_STRING_SVTOOLS_RTF_WMETAFILE "8"); rRtf.WriteOString(SAL_NEWLINE_STRING); if (pPresentationData) @@ -638,13 +638,13 @@ bool WrapGraphicInRtf(const Graphic& rGraphic, const SwFrameFormat& rFormat, SvS } // End pict. - rRtf.WriteCharPtr("}"); + rRtf.WriteOString("}"); // End result. - rRtf.WriteCharPtr("}"); + rRtf.WriteOString("}"); // End object. - rRtf.WriteCharPtr("}"); + rRtf.WriteOString("}"); return true; } } diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 43d7e43e8ae7..2229491a1140 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -753,11 +753,11 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aEncURL ); const char* const pDelim = "ÿ"; if( !aFilter.isEmpty() || !aSection.isEmpty() || bURLContainsDelim ) - rHTMLWrt.Strm().WriteCharPtr( pDelim ); + rHTMLWrt.Strm().WriteOString( pDelim ); if( !aFilter.isEmpty() ) HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aFilter ); if( !aSection.isEmpty() || bURLContainsDelim ) - rHTMLWrt.Strm().WriteCharPtr( pDelim ); + rHTMLWrt.Strm().WriteOString( pDelim ); if( !aSection.isEmpty() ) { aSection = aSection.replaceAll(u"%", u"%25"); @@ -1222,7 +1222,7 @@ void SwHTMLWriter::OutAnchor( const OUString& rName ) sOut.append(OOO_STRING_SVTOOLS_HTML_O_name "=\""); Strm().WriteOString( sOut ); sOut.setLength(0); - HTMLOutFuncs::Out_String( Strm(), rName ).WriteCharPtr( "\">" ); + HTMLOutFuncs::Out_String( Strm(), rName ).WriteOString( "\">" ); } else { @@ -1231,7 +1231,7 @@ void SwHTMLWriter::OutAnchor( const OUString& rName ) sOut.append(OOO_STRING_SVTOOLS_HTML_O_id "=\""); Strm().WriteOString( sOut ); sOut.setLength(0); - HTMLOutFuncs::Out_String( Strm(), rName.replace(' ', '_') ).WriteCharPtr( "\">" ); + HTMLOutFuncs::Out_String( Strm(), rName.replace(' ', '_') ).WriteOString( "\">" ); } HTMLOutFuncs::Out_AsciiTag( Strm(), Concat2View(GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor), false ); } @@ -1395,8 +1395,8 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic { m_nWarn = WARN_SWG_POOR_LOAD; } - Strm().WriteCharPtr( " " OOO_STRING_SVTOOLS_HTML_O_background "=\"" ); - Strm().WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_data ":" ); + Strm().WriteOString( " " OOO_STRING_SVTOOLS_HTML_O_background "=\"" ); + Strm().WriteOString( OOO_STRING_SVTOOLS_HTML_O_data ":" ); HTMLOutFuncs::Out_String( Strm(), aGraphicInBase64 ).WriteChar( '\"' ); } } @@ -1407,9 +1407,9 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic CopyLocalFileToINet( GraphicURL ); } OUString s( URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), GraphicURL)); - Strm().WriteCharPtr(" " OOO_STRING_SVTOOLS_HTML_O_background "=\"" ); + Strm().WriteOString(" " OOO_STRING_SVTOOLS_HTML_O_background "=\"" ); HTMLOutFuncs::Out_String( Strm(), s ); - Strm().WriteCharPtr("\""); + Strm().WriteOString("\""); } } @@ -1532,14 +1532,14 @@ void SwHTMLWriter::OutNewLine( bool bCheck ) { if( !bCheck || (Strm().Tell()-m_nLastLFPos) > m_nIndentLvl ) { - Strm().WriteCharPtr( SAL_NEWLINE_STRING ); + Strm().WriteOString( SAL_NEWLINE_STRING ); m_nLastLFPos = Strm().Tell(); } if( m_nIndentLvl && m_nIndentLvl <= MAX_INDENT_LEVEL) { sIndentTabs[m_nIndentLvl] = 0; - Strm().WriteCharPtr( sIndentTabs ); + Strm().WriteOString( sIndentTabs ); sIndentTabs[m_nIndentLvl] = '\t'; } } diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 42fb87a592e2..3df92c4226bd 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -55,7 +55,7 @@ namespace if (bNeg) aBuf[--i] = '-'; - return rStrm.WriteCharPtr( &aBuf[i] ); + return rStrm.WriteOString( &aBuf[i] ); } } diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 74656bdb110f..6e98e56c29b2 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -322,8 +322,8 @@ void RtfAttributeOutput::EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t pTex void RtfAttributeOutput::EmptyParagraph() { m_rExport.Strm() - .WriteCharPtr(SAL_NEWLINE_STRING) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PAR) + .WriteOString(SAL_NEWLINE_STRING) + .WriteOString(OOO_STRING_SVTOOLS_RTF_PAR) .WriteChar(' '); } @@ -1144,9 +1144,9 @@ void RtfAttributeOutput::FinishTableRowCell(const ww8::WW8TableNodeInfoInner::Po void RtfAttributeOutput::StartStyles() { m_rExport.Strm() - .WriteCharPtr(SAL_NEWLINE_STRING) + .WriteOString(SAL_NEWLINE_STRING) .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_COLORTBL); + .WriteOString(OOO_STRING_SVTOOLS_RTF_COLORTBL); m_rExport.OutColorTable(); OSL_ENSURE(m_aStylesheet.getLength() == 0, "m_aStylesheet is not empty"); m_aStylesheet.append(SAL_NEWLINE_STRING); @@ -1227,7 +1227,7 @@ void RtfAttributeOutput::PageBreakBefore(bool bBreak) { if (bBreak) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PAGEBB); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_PAGEBB); } } @@ -1276,16 +1276,16 @@ void RtfAttributeOutput::SectionFormProtection(bool bProtected) void RtfAttributeOutput::SectionLineNumbering(sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LINEMOD); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LINEMOD); m_rExport.OutLong(rLnNumInfo.GetCountBy()); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LINEX); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LINEX); m_rExport.OutLong(rLnNumInfo.GetPosFromLeft()); if (!rLnNumInfo.IsRestartEachPage()) - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LINECONT); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LINECONT); if (nRestartNo > 0) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LINESTARTS); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LINESTARTS); m_rExport.OutLong(nRestartNo); } } @@ -1331,7 +1331,7 @@ void RtfAttributeOutput::SectionPageBorders(const SwFrameFormat* pFormat, void RtfAttributeOutput::SectionBiDi(bool bBiDi) { - m_rExport.Strm().WriteCharPtr(bBiDi ? OOO_STRING_SVTOOLS_RTF_RTLSECT + m_rExport.Strm().WriteOString(bBiDi ? OOO_STRING_SVTOOLS_RTF_RTLSECT : OOO_STRING_SVTOOLS_RTF_LTRSECT); } @@ -1480,11 +1480,11 @@ void RtfAttributeOutput::WriteFootnoteEndnotePr(bool bFootnote, const SwEndNoteI void RtfAttributeOutput::NumberingDefinition(sal_uInt16 nId, const SwNumRule& /*rRule*/) { - m_rExport.Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LISTID); + m_rExport.Strm().WriteChar('{').WriteOString(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LISTID); m_rExport.OutULong(nId); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT).WriteChar('0'); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LS); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT).WriteChar('0'); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LS); m_rExport.OutULong(nId).WriteChar('}'); } @@ -1492,16 +1492,16 @@ void RtfAttributeOutput::StartAbstractNumbering(sal_uInt16 nId) { m_rExport.Strm() .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LIST) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID); + .WriteOString(OOO_STRING_SVTOOLS_RTF_LIST) + .WriteOString(OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID); m_rExport.OutULong(nId); m_nListId = nId; } void RtfAttributeOutput::EndAbstractNumbering() { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LISTID); - m_rExport.OutULong(m_nListId).WriteChar('}').WriteCharPtr(SAL_NEWLINE_STRING); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LISTID); + m_rExport.OutULong(m_nListId).WriteChar('}').WriteOString(SAL_NEWLINE_STRING); } void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, sal_uInt16 nStart, @@ -1512,13 +1512,13 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, sal_uInt16 nStart, sal_Int16 /*nListTabPos*/, const OUString& rNumberingString, const SvxBrushItem* pBrush) { - m_rExport.Strm().WriteCharPtr(SAL_NEWLINE_STRING); + m_rExport.Strm().WriteOString(SAL_NEWLINE_STRING); if (nLevel > 8) // RTF knows only 9 levels m_rExport.Strm() - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SOUTLVL); + .WriteOString(OOO_STRING_SVTOOLS_RTF_IGNORE) + .WriteOString(OOO_STRING_SVTOOLS_RTF_SOUTLVL); - m_rExport.Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LISTLEVEL); + m_rExport.Strm().WriteChar('{').WriteOString(OOO_STRING_SVTOOLS_RTF_LISTLEVEL); sal_uInt16 nVal = 0; switch (nNumberingType) @@ -1617,7 +1617,7 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, sal_uInt16 nStart, nVal = 22; break; } - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVELNFC); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LEVELNFC); m_rExport.OutULong(nVal); switch (eAdjust) @@ -1632,7 +1632,7 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, sal_uInt16 nStart, nVal = 0; break; } - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVELJC); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LEVELJC); m_rExport.OutULong(nVal); // bullet @@ -1641,54 +1641,53 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, sal_uInt16 nStart, int nIndex = m_rExport.GetGrfIndex(*pBrush); if (nIndex != -1) { - m_rExport.Strm().WriteCharPtr(LO_STRING_SVTOOLS_RTF_LEVELPICTURE); + m_rExport.Strm().WriteOString(LO_STRING_SVTOOLS_RTF_LEVELPICTURE); m_rExport.OutULong(nIndex); } } - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT); m_rExport.OutULong(nStart); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW); m_rExport.OutULong(nFollow); // leveltext group - m_rExport.Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVELTEXT).WriteChar(' '); + m_rExport.Strm().WriteChar('{').WriteOString(OOO_STRING_SVTOOLS_RTF_LEVELTEXT).WriteChar(' '); if (SVX_NUM_CHAR_SPECIAL == nNumberingType || SVX_NUM_BITMAP == nNumberingType) { - m_rExport.Strm().WriteCharPtr("\\'01"); + m_rExport.Strm().WriteOString("\\'01"); sal_Unicode cChar = rNumberingString[0]; - m_rExport.Strm().WriteCharPtr("\\u"); + m_rExport.Strm().WriteOString("\\u"); m_rExport.OutULong(cChar); - m_rExport.Strm().WriteCharPtr(" ?"); + m_rExport.Strm().WriteOString(" ?"); } else { - m_rExport.Strm().WriteCharPtr("\\'").WriteCharPtr( - msfilter::rtfutil::OutHex(rNumberingString.getLength(), 2).getStr()); - m_rExport.Strm().WriteCharPtr(msfilter::rtfutil::OutString(rNumberingString, + m_rExport.Strm().WriteOString("\\'").WriteOString( + msfilter::rtfutil::OutHex(rNumberingString.getLength(), 2)); + m_rExport.Strm().WriteOString(msfilter::rtfutil::OutString(rNumberingString, m_rExport.GetDefaultEncoding(), - /*bUnicode =*/false) - .getStr()); + /*bUnicode =*/false)); } - m_rExport.Strm().WriteCharPtr(";}"); + m_rExport.Strm().WriteOString(";}"); // write the levelnumbers - m_rExport.Strm().WriteCharPtr("{").WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS); + m_rExport.Strm().WriteOString("{").WriteOString(OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS); for (sal_uInt8 i = 0; i <= nLevel && pNumLvlPos[i]; ++i) { - m_rExport.Strm().WriteCharPtr("\\'").WriteCharPtr( - msfilter::rtfutil::OutHex(pNumLvlPos[i], 2).getStr()); + m_rExport.Strm().WriteOString("\\'").WriteOString( + msfilter::rtfutil::OutHex(pNumLvlPos[i], 2)); } - m_rExport.Strm().WriteCharPtr(";}"); + m_rExport.Strm().WriteOString(";}"); if (pOutSet) { if (pFont) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_F); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_F); m_rExport.OutULong(m_rExport.m_aFontHelper.GetId(*pFont)); } m_rExport.OutputItemSet(*pOutSet, false, true, i18n::ScriptType::LATIN, @@ -1697,8 +1696,8 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, sal_uInt16 nStart, m_rExport.Strm().WriteOString(aProperties); } - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FI); - m_rExport.OutLong(nFirstLineIndex).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LI); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_FI); + m_rExport.OutLong(nFirstLineIndex).WriteOString(OOO_STRING_SVTOOLS_RTF_LI); m_rExport.OutLong(nIndentAt); m_rExport.Strm().WriteChar('}'); @@ -1944,7 +1943,7 @@ void RtfAttributeOutput::writeTextFrame(const ww8::Frame& rFrame, bool bTextBox) m_aRunText.clear(); } - m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SHPTXT); + m_rExport.Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_SHPTXT); { // Save table state, in case the inner text also contains a table. @@ -1977,7 +1976,7 @@ void RtfAttributeOutput::writeTextFrame(const ww8::Frame& rFrame, bool bTextBox) m_rExport.WriteText(); m_rExport.RestoreData(); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PARD); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_PARD); m_rExport.SetRTFFlySyntax(false); m_aRun->append(aSave); m_aRunText.clear(); @@ -2054,8 +2053,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi m_rExport.m_pParentFrame = &rFrame; - m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SHP); - m_rExport.Strm().WriteCharPtr( + m_rExport.Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_SHP); + m_rExport.Strm().WriteOString( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPINST); // Shape properties. @@ -2074,7 +2073,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi // Write ZOrder. if (const SdrObject* pObject = rFrame.GetFrameFormat().FindRealSdrObject()) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPZ); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SHPZ); m_rExport.OutULong(pObject->GetOrdNum()); } @@ -2091,12 +2090,12 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi for (const std::pair<OString, OString>& rPair : m_aFlyProperties) { - m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{"); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " "); + m_rExport.Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_SP "{"); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SN " "); m_rExport.Strm().WriteOString(rPair.first); - m_rExport.Strm().WriteCharPtr("}{" OOO_STRING_SVTOOLS_RTF_SV " "); + m_rExport.Strm().WriteOString("}{" OOO_STRING_SVTOOLS_RTF_SV " "); m_rExport.Strm().WriteOString(rPair.second); - m_rExport.Strm().WriteCharPtr("}}"); + m_rExport.Strm().WriteOString("}}"); } m_aFlyProperties.clear(); @@ -2105,7 +2104,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi m_rExport.Strm().WriteChar('}'); // shpinst m_rExport.Strm().WriteChar('}'); // shp - m_rExport.Strm().WriteCharPtr(SAL_NEWLINE_STRING); + m_rExport.Strm().WriteOString(SAL_NEWLINE_STRING); } break; case ww8::Frame::eGraphic: @@ -3429,11 +3428,11 @@ void RtfAttributeOutput::FormatSurround(const SwFormatSurround& rSurround) if (rSurround.IsContour()) nWr = 4; // tight - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPWR); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SHPWR); m_rExport.OutLong(nWr); if (oWrk) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPWRK); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SHPWRK); m_rExport.OutLong(*oWrk); } } @@ -3454,8 +3453,8 @@ void RtfAttributeOutput::FormatVertOrientation(const SwFormatVertOrient& rFlyVer m_aFlyProperties.push_back( std::make_pair<OString, OString>("posrelv", OString::number(2))); m_rExport.Strm() - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPBYPARA) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE); + .WriteOString(OOO_STRING_SVTOOLS_RTF_SHPBYPARA) + .WriteOString(OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE); break; } @@ -3480,11 +3479,11 @@ void RtfAttributeOutput::FormatVertOrientation(const SwFormatVertOrient& rFlyVer break; } - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPTOP); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SHPTOP); m_rExport.OutLong(rFlyVert.GetPos()); if (m_pFlyFrameSize) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM); m_rExport.OutLong(rFlyVert.GetPos() + m_pFlyFrameSize->Height()); } } @@ -3504,8 +3503,8 @@ void RtfAttributeOutput::FormatHorizOrientation(const SwFormatHoriOrient& rFlyHo m_aFlyProperties.push_back( std::make_pair<OString, OString>("posrelh", OString::number(2))); m_rExport.Strm() - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPBXIGNORE); + .WriteOString(OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN) + .WriteOString(OOO_STRING_SVTOOLS_RTF_SHPBXIGNORE); break; } @@ -3527,11 +3526,11 @@ void RtfAttributeOutput::FormatHorizOrientation(const SwFormatHoriOrient& rFlyHo break; } - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPLEFT); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SHPLEFT); m_rExport.OutLong(rFlyHori.GetPos()); if (m_pFlyFrameSize) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SHPRIGHT); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SHPRIGHT); m_rExport.OutLong(rFlyHori.GetPos() + m_pFlyFrameSize->Width()); } } @@ -3720,15 +3719,15 @@ void RtfAttributeOutput::FormatBox(const SvxBoxItem& rBox) void RtfAttributeOutput::FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol, bool bEven, SwTwips nPageSize) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_COLS); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_COLS); m_rExport.OutLong(nCols); if (rCol.GetLineAdj() != COLADJ_NONE) - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LINEBETCOL); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LINEBETCOL); if (bEven) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_COLSX); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_COLSX); m_rExport.OutLong(rCol.GetGutterWidth(true)); } else @@ -3736,15 +3735,15 @@ void RtfAttributeOutput::FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& const SwColumns& rColumns = rCol.GetColumns(); for (sal_uInt16 n = 0; n < nCols;) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_COLNO); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_COLNO); m_rExport.OutLong(n + 1); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_COLW); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_COLW); m_rExport.OutLong(rCol.CalcPrtColWidth(n, nPageSize)); if (++n != nCols) { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_COLSR); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_COLSR); m_rExport.OutLong(rColumns[n - 1].GetRight() + rColumns[n].GetLeft()); } } @@ -3963,14 +3962,14 @@ void RtfAttributeOutput::StartFont(const OUString& rFamilyName) const { // write the font name hex-encoded, but without Unicode - Word at least // cannot read *both* Unicode and fallback as written by OutString - m_rExport.Strm().WriteCharPtr( - msfilter::rtfutil::OutString(rFamilyName, m_rExport.GetCurrentEncoding(), false).getStr()); + m_rExport.Strm().WriteOString( + msfilter::rtfutil::OutString(rFamilyName, m_rExport.GetCurrentEncoding(), false)); } /// End the font. void RtfAttributeOutput::EndFont() const { - m_rExport.Strm().WriteCharPtr(";}"); + m_rExport.Strm().WriteOString(";}"); m_rExport.SetCurrentEncoding(m_rExport.GetDefaultEncoding()); } @@ -3979,21 +3978,20 @@ void RtfAttributeOutput::FontAlternateName(const OUString& rName) const { m_rExport.Strm() .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FALT) + .WriteOString(OOO_STRING_SVTOOLS_RTF_IGNORE) + .WriteOString(OOO_STRING_SVTOOLS_RTF_FALT) .WriteChar(' '); // write the font name hex-encoded, but without Unicode - Word at least // cannot read *both* Unicode and fallback as written by OutString m_rExport.Strm() - .WriteCharPtr( - msfilter::rtfutil::OutString(rName, m_rExport.GetCurrentEncoding(), false).getStr()) + .WriteOString(msfilter::rtfutil::OutString(rName, m_rExport.GetCurrentEncoding(), false)) .WriteChar('}'); } /// Font charset. void RtfAttributeOutput::FontCharset(sal_uInt8 nCharSet) const { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FCHARSET); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_FCHARSET); m_rExport.OutULong(nCharSet); m_rExport.Strm().WriteChar(' '); m_rExport.SetCurrentEncoding(rtl_getTextEncodingFromWindowsCharset(nCharSet)); @@ -4002,7 +4000,7 @@ void RtfAttributeOutput::FontCharset(sal_uInt8 nCharSet) const /// Font family. void RtfAttributeOutput::FontFamilyType(FontFamily eFamily, const wwFont& rFont) const { - m_rExport.Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_F); + m_rExport.Strm().WriteChar('{').WriteOString(OOO_STRING_SVTOOLS_RTF_F); const char* pStr = OOO_STRING_SVTOOLS_RTF_FNIL; switch (eFamily) @@ -4025,13 +4023,13 @@ void RtfAttributeOutput::FontFamilyType(FontFamily eFamily, const wwFont& rFont) default: break; } - m_rExport.OutULong(m_rExport.m_aFontHelper.GetId(rFont)).WriteCharPtr(pStr); + m_rExport.OutULong(m_rExport.m_aFontHelper.GetId(rFont)).WriteOString(pStr); } /// Font pitch. void RtfAttributeOutput::FontPitchType(FontPitch ePitch) const { - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FPRQ); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_FPRQ); sal_uInt16 nVal = 0; switch (ePitch) @@ -4335,12 +4333,12 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat if (!pFrame || pFrame->IsInline()) { if (!bIsWMF) - m_rExport.Strm().WriteCharPtr( + m_rExport.Strm().WriteOString( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPPICT); } else { - m_rExport.Strm().WriteCharPtr( + m_rExport.Strm().WriteOString( "{" OOO_STRING_SVTOOLS_RTF_SHP "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPINST); m_pFlyFrameSize = &aRendered; @@ -4402,14 +4400,14 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat for (const std::pair<OString, OString>& rPair : aFlyProperties) { - m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{"); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " "); + m_rExport.Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_SP "{"); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SN " "); m_rExport.Strm().WriteOString(rPair.first); - m_rExport.Strm().WriteCharPtr("}{" OOO_STRING_SVTOOLS_RTF_SV " "); + m_rExport.Strm().WriteOString("}{" OOO_STRING_SVTOOLS_RTF_SV " "); m_rExport.Strm().WriteOString(rPair.second); - m_rExport.Strm().WriteCharPtr("}}"); + m_rExport.Strm().WriteOString("}}"); } - m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{" OOO_STRING_SVTOOLS_RTF_SN + m_rExport.Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_SP "{" OOO_STRING_SVTOOLS_RTF_SN " pib" "}{" OOO_STRING_SVTOOLS_RTF_SV " "); } @@ -4435,7 +4433,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat { if (!bIsWMF) { - m_rExport.Strm().WriteCharPtr("}" + m_rExport.Strm().WriteOString("}" "{" OOO_STRING_SVTOOLS_RTF_NONSHPPICT); aStream.Seek(0); @@ -4452,22 +4450,22 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat } } else - m_rExport.Strm().WriteCharPtr("}}}}"); // Close SV, SP, SHPINST and SHP. + m_rExport.Strm().WriteOString("}}}}"); // Close SV, SP, SHPINST and SHP. - m_rExport.Strm().WriteCharPtr(SAL_NEWLINE_STRING); + m_rExport.Strm().WriteOString(SAL_NEWLINE_STRING); } void RtfAttributeOutput::BulletDefinition(int /*nId*/, const Graphic& rGraphic, Size aSize) { - m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPPICT); - m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_PICT OOO_STRING_SVTOOLS_RTF_PNGBLIP); + m_rExport.Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPPICT); + m_rExport.Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_PICT OOO_STRING_SVTOOLS_RTF_PNGBLIP); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICWGOAL); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_PICWGOAL); m_rExport.OutULong(aSize.Width()); - m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICHGOAL); + m_rExport.Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_PICHGOAL); m_rExport.OutULong(aSize.Height()); - m_rExport.Strm().WriteCharPtr(SAL_NEWLINE_STRING); + m_rExport.Strm().WriteOString(SAL_NEWLINE_STRING); const sal_uInt8* pGraphicAry = nullptr; SvMemoryStream aStream; if (GraphicConverter::Export(aStream, rGraphic, ConvertDataFormat::PNG) != ERRCODE_NONE) @@ -4475,7 +4473,7 @@ void RtfAttributeOutput::BulletDefinition(int /*nId*/, const Graphic& rGraphic, sal_uInt32 nSize = aStream.TellEnd(); pGraphicAry = static_cast<sal_uInt8 const*>(aStream.GetData()); msfilter::rtfutil::WriteHex(pGraphicAry, nSize, &m_rExport.Strm()); - m_rExport.Strm().WriteCharPtr("}}"); // pict, shppict + m_rExport.Strm().WriteOString("}}"); // pict, shppict } void RtfAttributeOutput::SectionRtlGutter(const SfxBoolItem& rRtlGutter) @@ -4485,7 +4483,7 @@ void RtfAttributeOutput::SectionRtlGutter(const SfxBoolItem& rRtlGutter) return; } - m_rExport.Strm().WriteCharPtr(LO_STRING_SVTOOLS_RTF_RTLGUTTER); + m_rExport.Strm().WriteOString(LO_STRING_SVTOOLS_RTF_RTLGUTTER); } void RtfAttributeOutput::TextLineBreak(const SwFormatLineBreak& rLineBreak) diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index a48e70c8efe1..1cd2827384e5 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -231,15 +231,15 @@ void RtfExport::WriteNumbering() Strm() .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LISTTABLE); + .WriteOString(OOO_STRING_SVTOOLS_RTF_IGNORE) + .WriteOString(OOO_STRING_SVTOOLS_RTF_LISTTABLE); CollectGrfsOfBullets(); if (!m_vecBulletPic.empty()) Strm() .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE) - .WriteCharPtr(LO_STRING_SVTOOLS_RTF_LISTPICTURE); + .WriteOString(OOO_STRING_SVTOOLS_RTF_IGNORE) + .WriteOString(LO_STRING_SVTOOLS_RTF_LISTPICTURE); BulletDefinitions(); if (!m_vecBulletPic.empty()) Strm().WriteChar('}'); @@ -247,7 +247,7 @@ void RtfExport::WriteNumbering() AbstractNumberingDefinitions(); Strm().WriteChar('}'); - Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE); + Strm().WriteChar('{').WriteOString(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE); NumberingDefinitions(); Strm().WriteChar('}'); @@ -272,19 +272,18 @@ void RtfExport::WriteRevTab() // Now write the table Strm() .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_REVTBL) + .WriteOString(OOO_STRING_SVTOOLS_RTF_IGNORE) + .WriteOString(OOO_STRING_SVTOOLS_RTF_REVTBL) .WriteChar(' '); for (std::size_t i = 0; i < m_aRedlineTable.size(); ++i) { const OUString* pAuthor = GetRedline(i); Strm().WriteChar('{'); if (pAuthor) - Strm().WriteCharPtr( - msfilter::rtfutil::OutString(*pAuthor, m_eDefaultEncoding).getStr()); - Strm().WriteCharPtr(";}"); + Strm().WriteOString(msfilter::rtfutil::OutString(*pAuthor, m_eDefaultEncoding)); + Strm().WriteOString(";}"); } - Strm().WriteChar('}').WriteCharPtr(SAL_NEWLINE_STRING); + Strm().WriteChar('}').WriteOString(SAL_NEWLINE_STRING); } void RtfExport::WriteHeadersFooters(sal_uInt8 nHeadFootFlags, const SwFrameFormat& rFormat, @@ -439,9 +438,9 @@ sal_uInt64 RtfExport::ReplaceCr(sal_uInt8 /*nChar*/) void RtfExport::WriteFonts() { Strm() - .WriteCharPtr(SAL_NEWLINE_STRING) + .WriteOString(SAL_NEWLINE_STRING) .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FONTTBL); + .WriteOString(OOO_STRING_SVTOOLS_RTF_FONTTBL); m_aFontHelper.WriteFontTable(*m_pAttrOutput); Strm().WriteChar('}'); } @@ -461,10 +460,10 @@ void RtfExport::WriteFootnoteSettings() Strm() .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FTNSEP); + .WriteOString(OOO_STRING_SVTOOLS_RTF_IGNORE) + .WriteOString(OOO_STRING_SVTOOLS_RTF_FTNSEP); if (bSeparator) - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_CHFTNSEP); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_CHFTNSEP); Strm().WriteChar('}'); } @@ -474,10 +473,10 @@ void RtfExport::WriteMainText() if (std::unique_ptr<SvxBrushItem> oBrush = getBackground(); oBrush) { - Strm().WriteCharPtr(LO_STRING_SVTOOLS_RTF_VIEWBKSP).WriteChar('1'); - Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_BACKGROUND); - Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SHP); - Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPINST); + Strm().WriteOString(LO_STRING_SVTOOLS_RTF_VIEWBKSP).WriteChar('1'); + Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_BACKGROUND); + Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_SHP); + Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPINST); std::vector<std::pair<OString, OString>> aProperties{ { "shapeType", "1" }, @@ -485,12 +484,12 @@ void RtfExport::WriteMainText() }; for (const std::pair<OString, OString>& rPair : aProperties) { - Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{"); - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " "); + Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_SP "{"); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SN " "); Strm().WriteOString(rPair.first); - Strm().WriteCharPtr("}{" OOO_STRING_SVTOOLS_RTF_SV " "); + Strm().WriteOString("}{" OOO_STRING_SVTOOLS_RTF_SV " "); Strm().WriteOString(rPair.second); - Strm().WriteCharPtr("}}"); + Strm().WriteOString("}}"); } Strm().WriteChar('}'); // shpinst Strm().WriteChar('}'); // shp @@ -518,10 +517,10 @@ void RtfExport::WriteInfo() OString aGenerator = OUStringToOString(utl::DocInfoHelper::GetGeneratorString(), RTL_TEXTENCODING_UTF8); Strm() - .WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE LO_STRING_SVTOOLS_RTF_GENERATOR " ") + .WriteOString("{" OOO_STRING_SVTOOLS_RTF_IGNORE LO_STRING_SVTOOLS_RTF_GENERATOR " ") .WriteOString(aGenerator) .WriteChar('}'); - Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_INFO); + Strm().WriteChar('{').WriteOString(OOO_STRING_SVTOOLS_RTF_INFO); SwDocShell* pDocShell(m_rDoc.GetDocShell()); uno::Reference<document::XDocumentProperties> xDocProps; @@ -573,20 +572,20 @@ void RtfExport::WriteInfo() void RtfExport::WriteUserPropType(int nType) { - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PROPTYPE); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_PROPTYPE); OutULong(nType); } void RtfExport::WriteUserPropValue(const OUString& rValue) { - Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_STATICVAL " "); + Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_STATICVAL " "); Strm().WriteOString(msfilter::rtfutil::OutString(rValue, m_eDefaultEncoding)); Strm().WriteChar('}'); } void RtfExport::WriteUserProps() { - Strm().WriteChar('{').WriteCharPtr( + Strm().WriteChar('{').WriteOString( OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_USERPROPS); SwDocShell* pDocShell(m_rDoc.GetDocShell()); @@ -623,9 +622,9 @@ void RtfExport::WriteUserProps() continue; // Property name. - Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_PROPNAME " "); - Strm().WriteCharPtr( - msfilter::rtfutil::OutString(rProperty.Name, m_eDefaultEncoding).getStr()); + Strm().WriteOString("{" OOO_STRING_SVTOOLS_RTF_PROPNAME " "); + Strm().WriteOString( + msfilter::rtfutil::OutString(rProperty.Name, m_eDefaultEncoding)); Strm().WriteChar('}'); // Property value. @@ -715,7 +714,7 @@ void RtfExport::WriteDocVars() OUString aValue; xField->getPropertyValue("Content") >>= aValue; - Strm().WriteChar('{').WriteCharPtr( + Strm().WriteChar('{').WriteOString( OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_DOCVAR); Strm().WriteChar(' '); @@ -738,21 +737,21 @@ void RtfExport::WritePageDescTable() if (!nSize) return; - Strm().WriteCharPtr(SAL_NEWLINE_STRING); + Strm().WriteOString(SAL_NEWLINE_STRING); m_bOutPageDescs = true; Strm() .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCTBL); + .WriteOString(OOO_STRING_SVTOOLS_RTF_IGNORE) + .WriteOString(OOO_STRING_SVTOOLS_RTF_PGDSCTBL); for (std::size_t n = 0; n < nSize; ++n) { const SwPageDesc& rPageDesc = m_rDoc.GetPageDesc(n); Strm() - .WriteCharPtr(SAL_NEWLINE_STRING) + .WriteOString(SAL_NEWLINE_STRING) .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSC); - OutULong(n).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCUSE); + .WriteOString(OOO_STRING_SVTOOLS_RTF_PGDSC); + OutULong(n).WriteOString(OOO_STRING_SVTOOLS_RTF_PGDSCUSE); OutULong(static_cast<sal_uLong>(rPageDesc.ReadUseOn())); OutPageDescription(rPageDesc, false); @@ -762,14 +761,13 @@ void RtfExport::WritePageDescTable() while (i) if (rPageDesc.GetFollow() == &m_rDoc.GetPageDesc(--i)) break; - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCNXT); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_PGDSCNXT); OutULong(i).WriteChar(' '); Strm() - .WriteCharPtr( - msfilter::rtfutil::OutString(rPageDesc.GetName(), m_eDefaultEncoding).getStr()) - .WriteCharPtr(";}"); + .WriteOString(msfilter::rtfutil::OutString(rPageDesc.GetName(), m_eDefaultEncoding)) + .WriteOString(";}"); } - Strm().WriteChar('}').WriteCharPtr(SAL_NEWLINE_STRING); + Strm().WriteChar('}').WriteOString(SAL_NEWLINE_STRING); m_bOutPageDescs = false; // reset table infos, otherwise the depth of the cells will be incorrect, @@ -782,13 +780,13 @@ ErrCode RtfExport::ExportDocument_Impl() // Make the header Strm() .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_RTF) + .WriteOString(OOO_STRING_SVTOOLS_RTF_RTF) .WriteChar('1') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_ANSI); - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_DEFF); + .WriteOString(OOO_STRING_SVTOOLS_RTF_ANSI); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_DEFF); OutULong(m_aFontHelper.GetId(m_rDoc.GetAttrPool().GetDefaultItem(RES_CHRATR_FONT))); // If this not exist, MS don't understand our ansi characters (0x80-0xff). - Strm().WriteCharPtr("\\adeflang1025"); + Strm().WriteOString("\\adeflang1025"); // Font table WriteFonts(); @@ -808,32 +806,32 @@ ErrCode RtfExport::ExportDocument_Impl() WriteDocVars(); // Default TabSize - Strm().WriteOString(m_pAttrOutput->GetTabStop()).WriteCharPtr(SAL_NEWLINE_STRING); + Strm().WriteOString(m_pAttrOutput->GetTabStop()).WriteOString(SAL_NEWLINE_STRING); m_pAttrOutput->GetTabStop().setLength(0); // Automatic hyphenation: it's a global setting in Word, it's a paragraph setting in Writer. // Set it's value to "auto" and disable on paragraph level, if no hyphenation is used there. - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_HYPHAUTO); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_HYPHAUTO); OutULong(1); // Zoom SwViewShell* pViewShell(m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell()); if (pViewShell && pViewShell->GetViewOptions()->GetZoomType() == SvxZoomType::PERCENT) { - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_VIEWSCALE); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_VIEWSCALE); OutULong(pViewShell->GetViewOptions()->GetZoom()); } // Record changes? if (RedlineFlags::On & m_nOrigRedlineFlags) - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_REVISIONS); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_REVISIONS); // Mirror margins? if ((UseOnPage::Mirror & m_rDoc.GetPageDesc(0).ReadUseOn()) == UseOnPage::Mirror) - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGMIRROR); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_MARGMIRROR); // Gutter at top? if (m_rDoc.getIDocumentSettingAccess().get(DocumentSettingId::GUTTER_AT_TOP)) { - Strm().WriteCharPtr(LO_STRING_SVTOOLS_RTF_GUTTERPRL); + Strm().WriteOString(LO_STRING_SVTOOLS_RTF_GUTTERPRL); } // Init sections @@ -850,13 +848,13 @@ ErrCode RtfExport::ExportDocument_Impl() { if (!pSectionFormat->IsInUndo() && pSectionFormat->GetProtect().IsContentProtected()) { - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FORMPROT); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_FORMPROT); break; } } // enable form field shading - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FORMSHADE); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_FORMSHADE); // size and empty margins of the page if (m_rDoc.GetPageDescCnt()) @@ -886,8 +884,8 @@ ErrCode RtfExport::ExportDocument_Impl() { Strm() .WriteChar('{') - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCNO); + .WriteOString(OOO_STRING_SVTOOLS_RTF_IGNORE) + .WriteOString(OOO_STRING_SVTOOLS_RTF_PGDSCNO); OutULong(nPosInDoc).WriteChar('}'); } } @@ -897,46 +895,46 @@ ErrCode RtfExport::ExportDocument_Impl() { if (rPageDesc.GetLandscape()) - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LANDSCAPE); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LANDSCAPE); const SwFormatFrameSize& rSz = rFormatPage.GetFrameSize(); // Clipboard document is always created without a printer, then // the size will be always LONG_MAX! Solution then is to use A4 if (LONG_MAX == rSz.GetHeight() || LONG_MAX == rSz.GetWidth()) { - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PAPERH); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_PAPERH); Size a4 = SvxPaperInfo::GetPaperSize(PAPER_A4); - OutULong(a4.Height()).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PAPERW); + OutULong(a4.Height()).WriteOString(OOO_STRING_SVTOOLS_RTF_PAPERW); OutULong(a4.Width()); } else { - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PAPERH); - OutULong(rSz.GetHeight()).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PAPERW); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_PAPERH); + OutULong(rSz.GetHeight()).WriteOString(OOO_STRING_SVTOOLS_RTF_PAPERW); OutULong(rSz.GetWidth()); } } { const SvxLRSpaceItem& rLR = rFormatPage.GetLRSpace(); - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGL); - OutLong(rLR.GetLeft()).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGR); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_MARGL); + OutLong(rLR.GetLeft()).WriteOString(OOO_STRING_SVTOOLS_RTF_MARGR); OutLong(rLR.GetRight()); } { const SvxULSpaceItem& rUL = rFormatPage.GetULSpace(); - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGT); - OutLong(rUL.GetUpper()).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGB); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_MARGT); + OutLong(rUL.GetUpper()).WriteOString(OOO_STRING_SVTOOLS_RTF_MARGB); OutLong(rUL.GetLower()); } Strm() - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTD) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SBKNONE); + .WriteOString(OOO_STRING_SVTOOLS_RTF_SECTD) + .WriteOString(OOO_STRING_SVTOOLS_RTF_SBKNONE); m_pAttrOutput->SectFootnoteEndnotePr(); // All sections are unlocked by default - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED); OutLong(1); OutPageDescription(rPageDesc, true); // Changed bCheckForFirstPage to true so headers // following title page are correctly added - i13107 @@ -963,7 +961,7 @@ ErrCode RtfExport::ExportDocument_Impl() const char* pOut = FTNPOS_CHAPTER == rFootnoteInfo.m_ePos ? OOO_STRING_SVTOOLS_RTF_ENDDOC : OOO_STRING_SVTOOLS_RTF_FTNBJ; - Strm().WriteCharPtr(pOut).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FTNSTART); + Strm().WriteOString(pOut).WriteOString(OOO_STRING_SVTOOLS_RTF_FTNSTART); OutLong(rFootnoteInfo.m_nFootnoteOffset + 1); switch (rFootnoteInfo.m_eNum) @@ -978,7 +976,7 @@ ErrCode RtfExport::ExportDocument_Impl() pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART; break; } - Strm().WriteCharPtr(pOut); + Strm().WriteOString(pOut); switch (rFootnoteInfo.m_aFormat.GetNumberingType()) { @@ -1003,14 +1001,14 @@ ErrCode RtfExport::ExportDocument_Impl() pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR; break; } - Strm().WriteCharPtr(pOut); + Strm().WriteOString(pOut); const SwEndNoteInfo& rEndNoteInfo = m_rDoc.GetEndNoteInfo(); Strm() - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AENDDOC) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT) - .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AFTNSTART); + .WriteOString(OOO_STRING_SVTOOLS_RTF_AENDDOC) + .WriteOString(OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT) + .WriteOString(OOO_STRING_SVTOOLS_RTF_AFTNSTART); OutLong(rEndNoteInfo.m_nFootnoteOffset + 1); switch (rEndNoteInfo.m_aFormat.GetNumberingType()) @@ -1036,14 +1034,14 @@ ErrCode RtfExport::ExportDocument_Impl() pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR; break; } - Strm().WriteCharPtr(pOut); + Strm().WriteOString(pOut); } if (!m_rDoc.getIDocumentSettingAccess().get(DocumentSettingId::PARA_SPACE_MAX)) // RTF default is true, so write compat flag if this should be false. - Strm().WriteCharPtr(LO_STRING_SVTOOLS_RTF_HTMAUTSP); + Strm().WriteOString(LO_STRING_SVTOOLS_RTF_HTMAUTSP); - Strm().WriteCharPtr(SAL_NEWLINE_STRING); + Strm().WriteOString(SAL_NEWLINE_STRING); WriteFootnoteSettings(); @@ -1087,7 +1085,7 @@ bool RtfExport::DisallowInheritingOutlineNumbering(const SwFormat& rFormat) ->IsAssignedToListLevelOfOutlineStyle()) { // Level 9 disables the outline - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVEL).WriteInt32(9); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LEVEL).WriteInt32(9); bRet = true; } @@ -1193,22 +1191,21 @@ void RtfExport::OutUnicode(const char* pToken, const OUString& rContent, bool bU if (!bUpr) { - Strm().WriteChar('{').WriteCharPtr(pToken).WriteChar(' '); - Strm().WriteCharPtr(msfilter::rtfutil::OutString(rContent, m_eCurrentEncoding).getStr()); + Strm().WriteChar('{').WriteOString(pToken).WriteChar(' '); + Strm().WriteOString(msfilter::rtfutil::OutString(rContent, m_eCurrentEncoding)); Strm().WriteChar('}'); } else - Strm().WriteCharPtr( - msfilter::rtfutil::OutStringUpr(pToken, rContent, m_eCurrentEncoding).getStr()); + Strm().WriteOString(msfilter::rtfutil::OutStringUpr(pToken, rContent, m_eCurrentEncoding)); } void RtfExport::OutDateTime(const char* pStr, const util::DateTime& rDT) { - Strm().WriteChar('{').WriteCharPtr(pStr).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_YR); - OutULong(rDT.Year).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MO); - OutULong(rDT.Month).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_DY); - OutULong(rDT.Day).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_HR); - OutULong(rDT.Hours).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MIN); + Strm().WriteChar('{').WriteOString(pStr).WriteOString(OOO_STRING_SVTOOLS_RTF_YR); + OutULong(rDT.Year).WriteOString(OOO_STRING_SVTOOLS_RTF_MO); + OutULong(rDT.Month).WriteOString(OOO_STRING_SVTOOLS_RTF_DY); + OutULong(rDT.Day).WriteOString(OOO_STRING_SVTOOLS_RTF_HR); + OutULong(rDT.Hours).WriteOString(OOO_STRING_SVTOOLS_RTF_MIN); OutULong(rDT.Minutes).WriteChar('}'); } @@ -1409,9 +1406,9 @@ void RtfExport::OutColorTable() const Color& rCol = m_aColTable[n]; if (n || COL_AUTO != rCol) { - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_RED); - OutULong(rCol.GetRed()).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_GREEN); - OutULong(rCol.GetGreen()).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_BLUE); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_RED); + OutULong(rCol.GetRed()).WriteOString(OOO_STRING_SVTOOLS_RTF_GREEN); + OutULong(rCol.GetGreen()).WriteOString(OOO_STRING_SVTOOLS_RTF_BLUE); OutULong(rCol.GetBlue()); } Strm().WriteChar(';'); @@ -1461,7 +1458,7 @@ void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bCheckForFirst m_pCurrentPageDesc = m_pCurrentPageDesc->GetFollow(); if (m_pCurrentPageDesc->GetLandscape()) - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LNDSCPSXN); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_LNDSCPSXN); const SwFormat* pFormat = &m_pCurrentPageDesc->GetMaster(); //GetLeft(); m_bOutPageDescs = true; @@ -1483,7 +1480,7 @@ void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bCheckForFirst // title page if (m_pCurrentPageDesc != &rPgDsc) { - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_TITLEPG); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_TITLEPG); m_pCurrentPageDesc = &rPgDsc; if (m_pCurrentPageDesc->GetMaster().GetAttrSet().GetItemState(RES_HEADER, false, &pItem) == SfxItemState::SET) @@ -1522,10 +1519,10 @@ void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader) /* is this a title page? */ if (m_pCurrentPageDesc->GetFollow() && m_pCurrentPageDesc->GetFollow() != m_pCurrentPageDesc) { - Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_TITLEPG); + Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_TITLEPG); pStr = (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADERF : OOO_STRING_SVTOOLS_RTF_FOOTERF); } - Strm().WriteChar('{').WriteCharPtr(pStr); + Strm().WriteChar('{').WriteOString(pStr); WriteHeaderFooterText(m_pCurrentPageDesc->GetMaster(), bHeader); Strm().WriteChar('}'); diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index c68b232d967c..ac33f5eda4a3 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -42,9 +42,9 @@ int INetMIMEMessageStream::GetHeaderLine(char* pData, sal_uInt32 nSize) { // NYI: Folding long lines. maMsgBuffer.WriteOString( aHeader.GetName() ); - maMsgBuffer.WriteCharPtr( ": " ); + maMsgBuffer.WriteOString( ": " ); maMsgBuffer.WriteOString( aHeader.GetValue() ); - maMsgBuffer.WriteCharPtr( "\r\n" ); + maMsgBuffer.WriteOString( "\r\n" ); } } diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 25c658a7685b..32a0c49f04f3 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1047,12 +1047,6 @@ SvStream& SvStream::WriteDouble ( const double& r ) return *this; } -SvStream& SvStream::WriteCharPtr( const char* pBuf ) -{ - WriteBytes( pBuf, strlen(pBuf) ); - return *this; -} - SvStream& SvStream::WriteStream( SvStream& rStream ) { const sal_uInt32 cBufLen = 0x8000; @@ -1361,14 +1355,12 @@ void SvStream::RefreshBuffer() SvStream& SvStream::WriteInt32AsString(sal_Int32 nInt32) { - WriteOString(OString::number(nInt32)); - return *this; + return WriteOString(OString::number(nInt32)); } SvStream& SvStream::WriteUInt32AsString(sal_uInt32 nUInt32) { - WriteOString(OString::number(nUInt32)); - return *this; + return WriteOString(OString::number(nUInt32)); } #define CRYPT_BUFSIZE 1024 diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index 905baba98775..a6189a36dc1b 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -66,9 +66,9 @@ static OUString getCacheFolder() static void writeToLog(SvStream& stream, const char* key, const char* value) { - stream.WriteCharPtr(key); - stream.WriteCharPtr(": "); - stream.WriteCharPtr(value); + stream.WriteOString(key); + stream.WriteOString(": "); + stream.WriteOString(value); stream.WriteChar('\n'); } diff --git a/vcl/source/filter/eps/eps.cxx b/vcl/source/filter/eps/eps.cxx index c22a109a3ce2..8a4c140ee82d 100644 --- a/vcl/source/filter/eps/eps.cxx +++ b/vcl/source/filter/eps/eps.cxx @@ -442,7 +442,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter void PSWriter::ImplWriteProlog( const Graphic* pPreview ) { ImplWriteLine( "%!PS-Adobe-3.0 EPSF-3.0 " ); - mpPS->WriteCharPtr( "%%BoundingBox: " ); // BoundingBox + mpPS->WriteOString( "%%BoundingBox: " ); // BoundingBox ImplWriteLong( 0 ); ImplWriteLong( 0 ); Size aSizePoint = OutputDevice::LogicToLogic( pMTF->GetPrefSize(), @@ -463,7 +463,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) // defaults - mpPS->WriteCharPtr( "%%LanguageLevel: " ); // Language level + mpPS->WriteOString( "%%LanguageLevel: " ); // Language level ImplWriteLong( mnLevel, PS_RET ); if ( !mbGrayScale && mnLevel == 1 ) ImplWriteLine( "%%Extensions: CMYK" ); // CMYK extension is to set in color mode in level 1 @@ -477,10 +477,10 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) BitmapReadAccess* pAcc = aTmpBitmap.AcquireReadAccess(); if ( pAcc ) { - mpPS->WriteCharPtr( "%%BeginPreview: " ); // BoundingBox + mpPS->WriteOString( "%%BeginPreview: " ); // BoundingBox ImplWriteLong( aSizeBitmap.Width() ); ImplWriteLong( aSizeBitmap.Height() ); - mpPS->WriteCharPtr( "1 " ); + mpPS->WriteOString( "1 " ); sal_Int32 nLines = aSizeBitmap.Width() / 312; if ( ( nLines * 312 ) != aSizeBitmap.Width() ) nLines++; @@ -498,7 +498,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) if ( !nCount2 ) { ImplExecMode( PS_RET ); - mpPS->WriteCharPtr( "%" ); + mpPS->WriteOString( "%" ); nCount2 = 312; } nVal <<= 1; @@ -1285,12 +1285,12 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) ImplAddPath( aPolyPoly.GetObject( i ) ); if ( ++i < nPolyCount ) { - mpPS->WriteCharPtr( "p" ); + mpPS->WriteOString( "p" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } } - mpPS->WriteCharPtr( "p ef" ); + mpPS->WriteOString( "p ef" ); mnCursorPos += 4; ImplExecMode( PS_RET ); } @@ -1416,7 +1416,7 @@ void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3 ImplWritePoint( rP1 ); ImplWritePoint( rP2 ); ImplWritePoint( rP3 ); - mpPS->WriteCharPtr( "ct " ); + mpPS->WriteOString( "ct " ); ImplExecMode( nMode ); } @@ -1448,11 +1448,11 @@ void PSWriter::ImplRect( const tools::Rectangle & rRect ) ImplWriteLineColor( PS_SPACE ); ImplMoveTo( rRect.TopLeft() ); ImplWriteDouble( nWidth ); - mpPS->WriteCharPtr( "0 rl 0 " ); + mpPS->WriteOString( "0 rl 0 " ); ImplWriteDouble( nHeight ); - mpPS->WriteCharPtr( "rl " ); + mpPS->WriteOString( "rl " ); ImplWriteDouble( nWidth ); - mpPS->WriteCharPtr( "neg 0 rl " ); + mpPS->WriteOString( "neg 0 rl " ); ImplClosePathDraw(); } mpPS->WriteUChar( 10 ); @@ -1467,12 +1467,12 @@ void PSWriter::ImplRectFill( const tools::Rectangle & rRect ) ImplWriteFillColor( PS_SPACE ); ImplMoveTo( rRect.TopLeft() ); ImplWriteDouble( nWidth ); - mpPS->WriteCharPtr( "0 rl 0 " ); + mpPS->WriteOString( "0 rl 0 " ); ImplWriteDouble( nHeight ); - mpPS->WriteCharPtr( "rl " ); + mpPS->WriteOString( "rl " ); ImplWriteDouble( nWidth ); - mpPS->WriteCharPtr( "neg 0 rl ef " ); - mpPS->WriteCharPtr( "p ef" ); + mpPS->WriteOString( "neg 0 rl ef " ); + mpPS->WriteOString( "p ef" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } @@ -1508,7 +1508,7 @@ void PSWriter::ImplIntersect( const tools::PolyPolygon& rPolyPoly ) ImplAddPath( rPolyPoly.GetObject( i ) ); if ( ++i < nPolyCount ) { - mpPS->WriteCharPtr( "p" ); + mpPS->WriteOString( "p" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } @@ -1543,12 +1543,12 @@ void PSWriter::ImplPolyPoly( const tools::PolyPolygon & rPolyPoly, bool bTextOut ImplAddPath( rPolyPoly.GetObject( i ) ); if ( ++i < nPolyCount ) { - mpPS->WriteCharPtr( "p" ); + mpPS->WriteOString( "p" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } } - mpPS->WriteCharPtr( "p ef" ); + mpPS->WriteOString( "p ef" ); mnCursorPos += 4; ImplExecMode( PS_RET ); } @@ -1736,14 +1736,14 @@ void PSWriter::ImplBmp( Bitmap const * pBitmap, Bitmap const * pMaskBitmap, cons { ImplWriteLong( nWidth ); ImplWriteLong( nHeight ); - mpPS->WriteCharPtr( "8 [" ); + mpPS->WriteOString( "8 [" ); ImplWriteLong( nWidth ); - mpPS->WriteCharPtr( "0 0 " ); + mpPS->WriteOString( "0 0 " ); ImplWriteLong( -nHeight ); ImplWriteLong( 0 ); ImplWriteLong( nHeight ); ImplWriteLine( "]" ); - mpPS->WriteCharPtr( "{currentfile " ); + mpPS->WriteOString( "{currentfile " ); ImplWriteLong( nWidth ); ImplWriteLine( "string readhexstring pop}" ); ImplWriteLine( "image" ); @@ -1764,15 +1764,15 @@ void PSWriter::ImplBmp( Bitmap const * pBitmap, Bitmap const * pMaskBitmap, cons ImplWriteLine( "/DeviceGray setcolorspace" ); ImplWriteLine( "<<" ); ImplWriteLine( "/ImageType 1" ); - mpPS->WriteCharPtr( "/Width " ); + mpPS->WriteOString( "/Width " ); ImplWriteLong( nWidth, PS_RET ); - mpPS->WriteCharPtr( "/Height " ); + mpPS->WriteOString( "/Height " ); ImplWriteLong( nHeight, PS_RET ); ImplWriteLine( "/BitsPerComponent 8" ); ImplWriteLine( "/Decode[0 1]" ); - mpPS->WriteCharPtr( "/ImageMatrix[" ); + mpPS->WriteOString( "/ImageMatrix[" ); ImplWriteLong( nWidth ); - mpPS->WriteCharPtr( "0 0 " ); + mpPS->WriteOString( "0 0 " ); ImplWriteLong( -nHeight ); ImplWriteLong( 0 ); ImplWriteLong( nHeight, PS_NONE ); @@ -1829,15 +1829,15 @@ void PSWriter::ImplBmp( Bitmap const * pBitmap, Bitmap const * pMaskBitmap, cons ImplWriteLine( "] setcolorspace" ); ImplWriteLine( "<<" ); ImplWriteLine( "/ImageType 1" ); - mpPS->WriteCharPtr( "/Width " ); + mpPS->WriteOString( "/Width " ); ImplWriteLong( nWidth, PS_RET ); - mpPS->WriteCharPtr( "/Height " ); + mpPS->WriteOString( "/Height " ); ImplWriteLong( nHeight, PS_RET ); ImplWriteLine( "/BitsPerComponent 8" ); ImplWriteLine( "/Decode[0 255]" ); - mpPS->WriteCharPtr( "/ImageMatrix[" ); + mpPS->WriteOString( "/ImageMatrix[" ); ImplWriteLong( nWidth ); - mpPS->WriteCharPtr( "0 0 " ); + mpPS->WriteOString( "0 0 " ); ImplWriteLong( -nHeight ); ImplWriteLong( 0); ImplWriteLong( nHeight, PS_NONE ); @@ -1878,15 +1878,15 @@ void PSWriter::ImplBmp( Bitmap const * pBitmap, Bitmap const * pMaskBitmap, cons ImplWriteLine( "/DeviceRGB setcolorspace" ); ImplWriteLine( "<<" ); ImplWriteLine( "/ImageType 1" ); - mpPS->WriteCharPtr( "/Width " ); + mpPS->WriteOString( "/Width " ); ImplWriteLong( nWidth, PS_RET ); - mpPS->WriteCharPtr( "/Height " ); + mpPS->WriteOString( "/Height " ); ImplWriteLong( nHeight, PS_RET ); ImplWriteLine( "/BitsPerComponent 8" ); ImplWriteLine( "/Decode[0 1 0 1 0 1]" ); - mpPS->WriteCharPtr( "/ImageMatrix[" ); + mpPS->WriteOString( "/ImageMatrix[" ); ImplWriteLong( nWidth ); - mpPS->WriteCharPtr( "0 0 " ); + mpPS->WriteOString( "0 0 " ); ImplWriteLong( -nHeight ); ImplWriteLong( 0 ); ImplWriteLong( nHeight, PS_NONE ); @@ -2025,7 +2025,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, KernArra if ( nRotation ) { ImplWriteF( nRotation.get(), 1 ); - mpPS->WriteCharPtr( "r " ); + mpPS->WriteOString( "r " ); } for (auto const& elem : aPolyPolyVec) ImplPolyPoly( elem, true ); @@ -2069,7 +2069,7 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint ) maLastFont = maFont; aSize = maFont.GetFontSize(); ImplWriteDouble( aSize.Height() ); - mpPS->WriteCharPtr( "sf " ); + mpPS->WriteOString( "sf " ); } if ( eTextAlign != ALIGN_BASELINE ) { // PostScript does not know about FontAlignment @@ -2081,29 +2081,29 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint ) ImplMoveTo( aPoint ); if ( nRotation ) { - mpPS->WriteCharPtr( "gs " ); + mpPS->WriteOString( "gs " ); ImplWriteF( nRotation.get(), 1 ); - mpPS->WriteCharPtr( "r " ); + mpPS->WriteOString( "r " ); } } void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic ) { mpPS->WriteUChar( '/' ); //convert the font pOriginalName using ISOLatin1Encoding - mpPS->WriteCharPtr( pOriginalName ); + mpPS->WriteOString( pOriginalName ); switch ( maFont.GetWeight() ) { case WEIGHT_SEMIBOLD : case WEIGHT_BOLD : case WEIGHT_ULTRABOLD : case WEIGHT_BLACK : - mpPS->WriteCharPtr( "-Bold" ); + mpPS->WriteOString( "-Bold" ); if ( maFont.GetItalic() != ITALIC_NONE ) - mpPS->WriteCharPtr( pItalic ); + mpPS->WriteOString( pItalic ); break; default: if ( maFont.GetItalic() != ITALIC_NONE ) - mpPS->WriteCharPtr( pItalic ); + mpPS->WriteOString( pItalic ); break; } ImplWriteLine( " f" ); @@ -2111,14 +2111,14 @@ void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic ) void PSWriter::ImplClosePathDraw() { - mpPS->WriteCharPtr( "pc" ); + mpPS->WriteOString( "pc" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } void PSWriter::ImplPathDraw() { - mpPS->WriteCharPtr( "ps" ); + mpPS->WriteOString( "ps" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } @@ -2166,7 +2166,7 @@ void PSWriter::ImplWriteColor( NMode nMode ) ImplWriteB1 ( aColor.GetGreen() ); ImplWriteB1 ( aColor.GetBlue() ); } - mpPS->WriteCharPtr( "c" ); // ( c is defined as setrgbcolor or setgray ) + mpPS->WriteOString( "c" ); // ( c is defined as setrgbcolor or setgray ) ImplExecMode( nMode ); } diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx index c6638ec201eb..148f0bb45cf8 100644 --- a/vcl/source/filter/ipdf/pdfdocument.cxx +++ b/vcl/source/filter/ipdf/pdfdocument.cxx @@ -256,8 +256,8 @@ sal_Int32 PDFDocument::WriteAppearanceObject(tools::Rectangle& rSignatureRectang // Write the object content. SvMemoryStream aEditBuffer; aEditBuffer.WriteUInt32AsString(nAppearanceId); - aEditBuffer.WriteCharPtr(" 0 obj\n"); - aEditBuffer.WriteCharPtr("<</Type/XObject\n/Subtype/Form\n"); + aEditBuffer.WriteOString(" 0 obj\n"); + aEditBuffer.WriteOString("<</Type/XObject\n/Subtype/Form\n"); PDFObjectCopier aCopier(*this); if (!aContentStreams.empty()) @@ -268,11 +268,11 @@ sal_Int32 PDFDocument::WriteAppearanceObject(tools::Rectangle& rSignatureRectang aEditBuffer.WriteOString(aBuffer); } - aEditBuffer.WriteCharPtr("/BBox[0 0 "); + aEditBuffer.WriteOString("/BBox[0 0 "); aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getOpenWidth())); - aEditBuffer.WriteCharPtr(" "); + aEditBuffer.WriteOString(" "); aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getOpenHeight())); - aEditBuffer.WriteCharPtr("]\n/Length "); + aEditBuffer.WriteOString("]\n/Length "); // Add the object to the doc-level edit buffer and update the offset. SvMemoryStream aStream; @@ -288,15 +288,15 @@ sal_Int32 PDFDocument::WriteAppearanceObject(tools::Rectangle& rSignatureRectang aEditBuffer.WriteOString(" /Filter/FlateDecode"); } - aEditBuffer.WriteCharPtr("\n>>\n"); + aEditBuffer.WriteOString("\n>>\n"); - aEditBuffer.WriteCharPtr("stream\n"); + aEditBuffer.WriteOString("stream\n"); // Copy the original page streams to the form XObject stream. aStream.Seek(0); aEditBuffer.WriteStream(aStream); - aEditBuffer.WriteCharPtr("\nendstream\nendobj\n\n"); + aEditBuffer.WriteOString("\nendstream\nendobj\n\n"); aEditBuffer.Seek(0); XRefEntry aAppearanceEntry; @@ -322,30 +322,30 @@ sal_Int32 PDFDocument::WriteAnnotObject(PDFObjectElement const& rFirstPage, sal_ aAnnotEntry.SetDirty(true); m_aXRef[nAnnotId] = aAnnotEntry; m_aEditBuffer.WriteUInt32AsString(nAnnotId); - m_aEditBuffer.WriteCharPtr(" 0 obj\n"); - m_aEditBuffer.WriteCharPtr("<</Type/Annot/Subtype/Widget/F 132\n"); - m_aEditBuffer.WriteCharPtr("/Rect[0 0 "); + m_aEditBuffer.WriteOString(" 0 obj\n"); + m_aEditBuffer.WriteOString("<</Type/Annot/Subtype/Widget/F 132\n"); + m_aEditBuffer.WriteOString("/Rect[0 0 "); m_aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getOpenWidth())); - m_aEditBuffer.WriteCharPtr(" "); + m_aEditBuffer.WriteOString(" "); m_aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getOpenHeight())); - m_aEditBuffer.WriteCharPtr("]\n"); - m_aEditBuffer.WriteCharPtr("/FT/Sig\n"); - m_aEditBuffer.WriteCharPtr("/P "); + m_aEditBuffer.WriteOString("]\n"); + m_aEditBuffer.WriteOString("/FT/Sig\n"); + m_aEditBuffer.WriteOString("/P "); m_aEditBuffer.WriteUInt32AsString(rFirstPage.GetObjectValue()); - m_aEditBuffer.WriteCharPtr(" 0 R\n"); - m_aEditBuffer.WriteCharPtr("/T(Signature"); + m_aEditBuffer.WriteOString(" 0 R\n"); + m_aEditBuffer.WriteOString("/T(Signature"); m_aEditBuffer.WriteUInt32AsString(nNextSignature); - m_aEditBuffer.WriteCharPtr(")\n"); - m_aEditBuffer.WriteCharPtr("/V "); + m_aEditBuffer.WriteOString(")\n"); + m_aEditBuffer.WriteOString("/V "); m_aEditBuffer.WriteUInt32AsString(nSignatureId); - m_aEditBuffer.WriteCharPtr(" 0 R\n"); - m_aEditBuffer.WriteCharPtr("/DV "); + m_aEditBuffer.WriteOString(" 0 R\n"); + m_aEditBuffer.WriteOString("/DV "); m_aEditBuffer.WriteUInt32AsString(nSignatureId); - m_aEditBuffer.WriteCharPtr(" 0 R\n"); - m_aEditBuffer.WriteCharPtr("/AP<<\n/N "); + m_aEditBuffer.WriteOString(" 0 R\n"); + m_aEditBuffer.WriteOString("/AP<<\n/N "); m_aEditBuffer.WriteInt32AsString(nAppearanceId); - m_aEditBuffer.WriteCharPtr(" 0 R\n>>\n"); - m_aEditBuffer.WriteCharPtr(">>\nendobj\n\n"); + m_aEditBuffer.WriteOString(" 0 R\n>>\n"); + m_aEditBuffer.WriteOString(">>\nendobj\n\n"); return nAnnotId; } @@ -369,7 +369,7 @@ bool PDFDocument::WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnot m_aXRef[nAnnotsId].SetOffset(m_aEditBuffer.Tell()); m_aXRef[nAnnotsId].SetDirty(true); m_aEditBuffer.WriteUInt32AsString(nAnnotsId); - m_aEditBuffer.WriteCharPtr(" 0 obj\n["); + m_aEditBuffer.WriteOString(" 0 obj\n["); // Write existing references. PDFArrayElement* pArray = pAnnotsObject->GetArray(); @@ -386,16 +386,16 @@ bool PDFDocument::WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnot continue; if (i) - m_aEditBuffer.WriteCharPtr(" "); + m_aEditBuffer.WriteOString(" "); m_aEditBuffer.WriteUInt32AsString(pReference->GetObjectValue()); - m_aEditBuffer.WriteCharPtr(" 0 R"); + m_aEditBuffer.WriteOString(" 0 R"); } // Write our reference. - m_aEditBuffer.WriteCharPtr(" "); + m_aEditBuffer.WriteOString(" "); m_aEditBuffer.WriteUInt32AsString(nAnnotId); - m_aEditBuffer.WriteCharPtr(" 0 R"); + m_aEditBuffer.WriteOString(" 0 R"); - m_aEditBuffer.WriteCharPtr("]\nendobj\n\n"); + m_aEditBuffer.WriteOString("]\nendobj\n\n"); } else { @@ -409,8 +409,8 @@ bool PDFDocument::WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnot m_aXRef[nFirstPageId].SetOffset(m_aEditBuffer.Tell()); m_aXRef[nFirstPageId].SetDirty(true); m_aEditBuffer.WriteUInt32AsString(nFirstPageId); - m_aEditBuffer.WriteCharPtr(" 0 obj\n"); - m_aEditBuffer.WriteCharPtr("<<"); + m_aEditBuffer.WriteOString(" 0 obj\n"); + m_aEditBuffer.WriteOString("<<"); auto pAnnotsArray = dynamic_cast<PDFArrayElement*>(pAnnots); if (!pAnnotsArray) { @@ -418,9 +418,9 @@ bool PDFDocument::WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnot m_aEditBuffer.WriteBytes(static_cast<const char*>(m_aEditBuffer.GetData()) + rFirstPage.GetDictionaryOffset(), rFirstPage.GetDictionaryLength()); - m_aEditBuffer.WriteCharPtr("/Annots["); + m_aEditBuffer.WriteOString("/Annots["); m_aEditBuffer.WriteUInt32AsString(nAnnotId); - m_aEditBuffer.WriteCharPtr(" 0 R]"); + m_aEditBuffer.WriteOString(" 0 R]"); } else { @@ -435,9 +435,9 @@ bool PDFDocument::WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnot m_aEditBuffer.WriteBytes(static_cast<const char*>(m_aEditBuffer.GetData()) + rFirstPage.GetDictionaryOffset(), nAnnotsBeforeEndLength); - m_aEditBuffer.WriteCharPtr(" "); + m_aEditBuffer.WriteOString(" "); m_aEditBuffer.WriteUInt32AsString(nAnnotId); - m_aEditBuffer.WriteCharPtr(" 0 R"); + m_aEditBuffer.WriteOString(" 0 R"); // Length of Annots end -> end of the dictionary. sal_uInt64 nAnnotsAfterEndLength = rFirstPage.GetDictionaryOffset() + rFirstPage.GetDictionaryLength() @@ -446,8 +446,8 @@ bool PDFDocument::WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnot + nAnnotsEndOffset, nAnnotsAfterEndLength); } - m_aEditBuffer.WriteCharPtr(">>"); - m_aEditBuffer.WriteCharPtr("\nendobj\n\n"); + m_aEditBuffer.WriteOString(">>"); + m_aEditBuffer.WriteOString("\nendobj\n\n"); } return true; @@ -500,7 +500,7 @@ bool PDFDocument::WriteCatalogObject(sal_Int32 nAnnotId, PDFReferenceElement*& p m_aXRef[nAcroFormId].SetOffset(m_aEditBuffer.Tell()); m_aXRef[nAcroFormId].SetDirty(true); m_aEditBuffer.WriteUInt32AsString(nAcroFormId); - m_aEditBuffer.WriteCharPtr(" 0 obj\n"); + m_aEditBuffer.WriteOString(" 0 obj\n"); // If this is nullptr, then the AcroForm object is not in an object stream. SvMemoryStream* pStreamBuffer = pAcroFormObject->GetStreamBuffer(); @@ -531,16 +531,16 @@ bool PDFDocument::WriteCatalogObject(sal_Int32 nAnnotId, PDFReferenceElement*& p else { nFieldsBeforeEndLength -= pAcroFormObject->GetDictionaryOffset(); - m_aEditBuffer.WriteCharPtr("<<"); + m_aEditBuffer.WriteOString("<<"); m_aEditBuffer.WriteBytes(static_cast<const char*>(m_aEditBuffer.GetData()) + pAcroFormObject->GetDictionaryOffset(), nFieldsBeforeEndLength); } // Append our reference at the end of the Fields array. - m_aEditBuffer.WriteCharPtr(" "); + m_aEditBuffer.WriteOString(" "); m_aEditBuffer.WriteUInt32AsString(nAnnotId); - m_aEditBuffer.WriteCharPtr(" 0 R"); + m_aEditBuffer.WriteOString(" 0 R"); // Length of Fields end -> end of the object dictionary. if (pStreamBuffer) @@ -558,10 +558,10 @@ bool PDFDocument::WriteCatalogObject(sal_Int32 nAnnotId, PDFReferenceElement*& p m_aEditBuffer.WriteBytes(static_cast<const char*>(m_aEditBuffer.GetData()) + nFieldsEndOffset, nFieldsAfterEndLength); - m_aEditBuffer.WriteCharPtr(">>"); + m_aEditBuffer.WriteOString(">>"); } - m_aEditBuffer.WriteCharPtr("\nendobj\n\n"); + m_aEditBuffer.WriteOString("\nendobj\n\n"); } else { @@ -570,17 +570,17 @@ bool PDFDocument::WriteCatalogObject(sal_Int32 nAnnotId, PDFReferenceElement*& p m_aXRef[nCatalogId].SetOffset(m_aEditBuffer.Tell()); m_aXRef[nCatalogId].SetDirty(true); m_aEditBuffer.WriteUInt32AsString(nCatalogId); - m_aEditBuffer.WriteCharPtr(" 0 obj\n"); - m_aEditBuffer.WriteCharPtr("<<"); + m_aEditBuffer.WriteOString(" 0 obj\n"); + m_aEditBuffer.WriteOString("<<"); if (!pAcroFormDictionary) { // No AcroForm key, assume no signatures. m_aEditBuffer.WriteBytes(static_cast<const char*>(m_aEditBuffer.GetData()) + pCatalog->GetDictionaryOffset(), pCatalog->GetDictionaryLength()); - m_aEditBuffer.WriteCharPtr("/AcroForm<</Fields[\n"); + m_aEditBuffer.WriteOString("/AcroForm<</Fields[\n"); m_aEditBuffer.WriteUInt32AsString(nAnnotId); - m_aEditBuffer.WriteCharPtr(" 0 R\n]/SigFlags 3>>\n"); + m_aEditBuffer.WriteOString(" 0 R\n]/SigFlags 3>>\n"); } else { @@ -607,9 +607,9 @@ bool PDFDocument::WriteCatalogObject(sal_Int32 nAnnotId, PDFReferenceElement*& p m_aEditBuffer.WriteBytes(static_cast<const char*>(m_aEditBuffer.GetData()) + pCatalog->GetDictionaryOffset(), nFieldsBeforeEndLength); - m_aEditBuffer.WriteCharPtr(" "); + m_aEditBuffer.WriteOString(" "); m_aEditBuffer.WriteUInt32AsString(nAnnotId); - m_aEditBuffer.WriteCharPtr(" 0 R"); + m_aEditBuffer.WriteOString(" 0 R"); // Length of Fields end -> end of the Catalog dictionary. sal_uInt64 nFieldsAfterEndLength = pCatalog->GetDictionaryOffset() + pCatalog->GetDictionaryLength() - nFieldsEndOffset; @@ -617,7 +617,7 @@ bool PDFDocument::WriteCatalogObject(sal_Int32 nAnnotId, PDFReferenceElement*& p + nFieldsEndOffset, nFieldsAfterEndLength); } - m_aEditBuffer.WriteCharPtr(">>\nendobj\n\n"); + m_aEditBuffer.WriteOString(">>\nendobj\n\n"); } return true; @@ -701,7 +701,7 @@ void PDFDocument::WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const* p } m_aEditBuffer.WriteUInt32AsString(nXRefStreamId); - m_aEditBuffer.WriteCharPtr( + m_aEditBuffer.WriteOString( " 0 obj\n<</DecodeParms<</Columns 5/Predictor 12>>/Filter/FlateDecode"); // ID. @@ -709,7 +709,7 @@ void PDFDocument::WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const* p if (pID) { const std::vector<PDFElement*>& rElements = pID->GetElements(); - m_aEditBuffer.WriteCharPtr("/ID [ <"); + m_aEditBuffer.WriteOString("/ID [ <"); for (size_t i = 0; i < rElements.size(); ++i) { auto pIDString = dynamic_cast<PDFHexStringElement*>(rElements[i]); @@ -718,36 +718,36 @@ void PDFDocument::WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const* p m_aEditBuffer.WriteOString(pIDString->GetValue()); if ((i + 1) < rElements.size()) - m_aEditBuffer.WriteCharPtr("> <"); + m_aEditBuffer.WriteOString("> <"); } - m_aEditBuffer.WriteCharPtr("> ] "); + m_aEditBuffer.WriteOString("> ] "); } // Index. - m_aEditBuffer.WriteCharPtr("/Index [ "); + m_aEditBuffer.WriteOString("/Index [ "); for (const auto& rXRef : m_aXRef) { if (!rXRef.second.GetDirty()) continue; m_aEditBuffer.WriteUInt32AsString(rXRef.first); - m_aEditBuffer.WriteCharPtr(" 1 "); + m_aEditBuffer.WriteOString(" 1 "); } - m_aEditBuffer.WriteCharPtr("] "); + m_aEditBuffer.WriteOString("] "); // Info. auto pInfo = dynamic_cast<PDFReferenceElement*>(m_pXRefStream->Lookup("Info")); if (pInfo) { - m_aEditBuffer.WriteCharPtr("/Info "); + m_aEditBuffer.WriteOString("/Info "); m_aEditBuffer.WriteUInt32AsString(pInfo->GetObjectValue()); - m_aEditBuffer.WriteCharPtr(" "); + m_aEditBuffer.WriteOString(" "); m_aEditBuffer.WriteUInt32AsString(pInfo->GetGenerationValue()); - m_aEditBuffer.WriteCharPtr(" R "); + m_aEditBuffer.WriteOString(" R "); } // Length. - m_aEditBuffer.WriteCharPtr("/Length "); + m_aEditBuffer.WriteOString("/Length "); { ZCodec aZCodec; aZCodec.BeginCompression(); @@ -765,30 +765,30 @@ void PDFDocument::WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const* p if (!m_aStartXRefs.empty()) { // Write location of the previous cross-reference section. - m_aEditBuffer.WriteCharPtr("/Prev "); + m_aEditBuffer.WriteOString("/Prev "); m_aEditBuffer.WriteUInt32AsString(m_aStartXRefs.back()); } // Root. - m_aEditBuffer.WriteCharPtr("/Root "); + m_aEditBuffer.WriteOString("/Root "); m_aEditBuffer.WriteUInt32AsString(pRoot->GetObjectValue()); - m_aEditBuffer.WriteCharPtr(" "); + m_aEditBuffer.WriteOString(" "); m_aEditBuffer.WriteUInt32AsString(pRoot->GetGenerationValue()); - m_aEditBuffer.WriteCharPtr(" R "); + m_aEditBuffer.WriteOString(" R "); // Size. - m_aEditBuffer.WriteCharPtr("/Size "); + m_aEditBuffer.WriteOString("/Size "); m_aEditBuffer.WriteUInt32AsString(m_aXRef.size()); - m_aEditBuffer.WriteCharPtr("/Type/XRef/W[1 3 1]>>\nstream\n"); + m_aEditBuffer.WriteOString("/Type/XRef/W[1 3 1]>>\nstream\n"); aXRefStream.Seek(0); m_aEditBuffer.WriteStream(aXRefStream); - m_aEditBuffer.WriteCharPtr("\nendstream\nendobj\n\n"); + m_aEditBuffer.WriteOString("\nendstream\nendobj\n\n"); } else { // Write the xref table. - m_aEditBuffer.WriteCharPtr("xref\n"); + m_aEditBuffer.WriteOString("xref\n"); for (const auto& rXRef : m_aXRef) { size_t nObject = rXRef.first; @@ -797,7 +797,7 @@ void PDFDocument::WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const* p continue; m_aEditBuffer.WriteUInt32AsString(nObject); - m_aEditBuffer.WriteCharPtr(" 1\n"); + m_aEditBuffer.WriteOString(" 1\n"); OStringBuffer aBuffer = OString::number(static_cast<sal_Int32>(nOffset)); while (aBuffer.getLength() < 10) aBuffer.insert(0, "0"); @@ -809,27 +809,27 @@ void PDFDocument::WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const* p } // Write the trailer. - m_aEditBuffer.WriteCharPtr("trailer\n<</Size "); + m_aEditBuffer.WriteOString("trailer\n<</Size "); m_aEditBuffer.WriteUInt32AsString(m_aXRef.size()); - m_aEditBuffer.WriteCharPtr("/Root "); + m_aEditBuffer.WriteOString("/Root "); m_aEditBuffer.WriteUInt32AsString(pRoot->GetObjectValue()); - m_aEditBuffer.WriteCharPtr(" "); + m_aEditBuffer.WriteOString(" "); m_aEditBuffer.WriteUInt32AsString(pRoot->GetGenerationValue()); - m_aEditBuffer.WriteCharPtr(" R\n"); + m_aEditBuffer.WriteOString(" R\n"); auto pInfo = dynamic_cast<PDFReferenceElement*>(m_pTrailer->Lookup("Info")); if (pInfo) { - m_aEditBuffer.WriteCharPtr("/Info "); + m_aEditBuffer.WriteOString("/Info "); m_aEditBuffer.WriteUInt32AsString(pInfo->GetObjectValue()); - m_aEditBuffer.WriteCharPtr(" "); + m_aEditBuffer.WriteOString(" "); m_aEditBuffer.WriteUInt32AsString(pInfo->GetGenerationValue()); - m_aEditBuffer.WriteCharPtr(" R\n"); + m_aEditBuffer.WriteOString(" R\n"); } auto pID = dynamic_cast<PDFArrayElement*>(m_pTrailer->Lookup("ID")); if (pID) { const std::vector<PDFElement*>& rElements = pID->GetElements(); - m_aEditBuffer.WriteCharPtr("/ID [ <"); + m_aEditBuffer.WriteOString("/ID [ <"); for (size_t i = 0; i < rElements.size(); ++i) { auto pIDString = dynamic_cast<PDFHexStringElement*>(rElements[i]); @@ -838,19 +838,19 @@ void PDFDocument::WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const* p m_aEditBuffer.WriteOString(pIDString->GetValue()); if ((i + 1) < rElements.size()) - m_aEditBuffer.WriteCharPtr(">\n<"); + m_aEditBuffer.WriteOString(">\n<"); } - m_aEditBuffer.WriteCharPtr("> ]\n"); + m_aEditBuffer.WriteOString("> ]\n"); } if (!m_aStartXRefs.empty()) { // Write location of the previous cross-reference section. - m_aEditBuffer.WriteCharPtr("/Prev "); + m_aEditBuffer.WriteOString("/Prev "); m_aEditBuffer.WriteUInt32AsString(m_aStartXRefs.back()); } - m_aEditBuffer.WriteCharPtr(">>\n"); + m_aEditBuffer.WriteOString(">>\n"); } } @@ -858,7 +858,7 @@ bool PDFDocument::Sign(const uno::Reference<security::XCertificate>& xCertificat const OUString& rDescription, bool bAdES) { m_aEditBuffer.Seek(STREAM_SEEK_TO_END); - m_aEditBuffer.WriteCharPtr("\n"); + m_aEditBuffer.WriteOString("\n"); sal_uInt64 nSignatureLastByteRangeOffset = 0; sal_Int64 nSignatureContentOffset = 0; @@ -906,9 +906,9 @@ bool PDFDocument::Sign(const uno::Reference<security::XCertificate>& xCertificat WriteXRef(nXRefOffset, pRoot); // Write startxref. - m_aEditBuffer.WriteCharPtr("startxref\n"); + m_aEditBuffer.WriteOString("startxref\n"); m_aEditBuffer.WriteUInt32AsString(nXRefOffset); - m_aEditBuffer.WriteCharPtr("\n%%EOF\n"); + m_aEditBuffer.WriteOString("\n%%EOF\n"); // Finalize the signature, now that we know the total file size. // Calculate the length of the last byte range. diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 3d3c8825f422..0eee2fee38b8 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -228,13 +228,13 @@ bool HexFmt::Flush() void HexFmt::OpenString() { - o->WriteCharPtr("<\n"); + o->WriteOString("<\n"); } void HexFmt::CloseString() { Flush(); - o->WriteCharPtr("00\n>\n"); + o->WriteOString("00\n>\n"); } void HexFmt::BlockWrite(const void *ptr, sal_uInt32 size) @@ -252,7 +252,7 @@ void HexFmt::BlockWrite(const void *ptr, sal_uInt32 size) buffer[bufpos++] = toHex(Ch & 0xF); if (bufpos == HFORMAT_LINELEN) { Flush(); - o->WriteCharPtr("\n"); + o->WriteOString("\n"); } } @@ -1628,16 +1628,16 @@ SFErrCodes CreateT3FromTTGlyphs(TrueTypeFont *ttf, SvStream *outf, const char *f char buf[bufmax]; snprintf(buf, bufmax, h01, GetInt16(table, 0), GetUInt16(table, 2), GetInt16(table, 4), GetUInt16(table, 6)); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, h02, modname, modver, modextra); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, h09, ttf->psname.getStr()); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%s", h10); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, h11, fname); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); /* snprintf(buf, bufmax, h12, 4000000); */ /* XUID generation: @@ -1651,29 +1651,29 @@ SFErrCodes CreateT3FromTTGlyphs(TrueTypeFont *ttf, SvStream *outf, const char *f */ snprintf(buf, bufmax, h17, rtl_crc32(0, ttf->ptr, ttf->fsize), nGlyphs, rtl_crc32(0, glyphArray, nGlyphs * 2), rtl_crc32(0, encoding, nGlyphs)); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%s", h13); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, h14, XUnits(UPEm, GetInt16(table, 36)), XUnits(UPEm, GetInt16(table, 38)), XUnits(UPEm, GetInt16(table, 40)), XUnits(UPEm, GetInt16(table, 42))); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%s", h15); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); for (i = 0; i < nGlyphs; i++) { snprintf(buf, bufmax, h16, encoding[i], i); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); } snprintf(buf, bufmax, h30, nGlyphs+1); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%s", h31); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%s", h32); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); for (i = 0; i < nGlyphs; i++) { snprintf(buf, bufmax, h33, i); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); int r = GetTTGlyphOutline(ttf, glyphArray[i] < ttf->glyphCount() ? glyphArray[i] : 0, pa, &metrics, nullptr); if (r > 0) { @@ -1692,7 +1692,7 @@ SFErrCodes CreateT3FromTTGlyphs(TrueTypeFont *ttf, SvStream *outf, const char *f XUnits(UPEm, metrics.yMin), XUnits(UPEm, metrics.xMax), XUnits(UPEm, metrics.yMax)); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); for (j = 0; j < n; j++) { @@ -1700,22 +1700,22 @@ SFErrCodes CreateT3FromTTGlyphs(TrueTypeFont *ttf, SvStream *outf, const char *f { case PS_MOVETO: snprintf(buf, bufmax, "\t%d %d moveto\n", XUnits(UPEm, path[j].x1), XUnits(UPEm, path[j].y1)); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); break; case PS_LINETO: snprintf(buf, bufmax, "\t%d %d lineto\n", XUnits(UPEm, path[j].x1), XUnits(UPEm, path[j].y1)); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); break; case PS_CURVETO: snprintf(buf, bufmax, "\t%d %d %d %d %d %d curveto\n", XUnits(UPEm, path[j].x1), XUnits(UPEm, path[j].y1), XUnits(UPEm, path[j].x2), XUnits(UPEm, path[j].y2), XUnits(UPEm, path[j].x3), XUnits(UPEm, path[j].y3)); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); break; case PS_CLOSEPATH: snprintf(buf, bufmax, "\tclosepath\n"); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); break; case PS_NOOP: break; @@ -1724,21 +1724,21 @@ SFErrCodes CreateT3FromTTGlyphs(TrueTypeFont *ttf, SvStream *outf, const char *f if (n > 0) { snprintf(buf, bufmax, "\tfill\n"); /* if glyph is not a whitespace character */ - outf->WriteCharPtr(buf); + outf->WriteOString(buf); } snprintf(buf, bufmax, "%s", h34); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); path.reset(); } snprintf(buf, bufmax, "%s", h35); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%s", h40); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, h41, fname); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); return SFErrCodes::Ok; } @@ -2056,7 +2056,7 @@ static void DumpSfnts(SvStream *outf, sal_uInt8 *sfntP, sal_uInt32 sfntLen) std::unique_ptr<sal_uInt32[]> offs(new sal_uInt32[numTables]); - outf->WriteCharPtr("/sfnts ["); + outf->WriteOString("/sfnts ["); h.OpenString(); h.BlockWrite(sfntP, 12); /* stream out the Offset Table */ h.BlockWrite(sfntP+12, 16 * numTables); /* stream out the Table Directory */ @@ -2125,7 +2125,7 @@ static void DumpSfnts(SvStream *outf, sal_uInt8 *sfntP, sal_uInt32 sfntLen) h.BlockWrite(pad, (4 - (len & 3)) & 3); } h.CloseString(); - outf->WriteCharPtr("] def\n"); + outf->WriteOString("] def\n"); } SFErrCodes CreateT42FromTTGlyphs(TrueTypeFont *ttf, @@ -2205,57 +2205,57 @@ SFErrCodes CreateT42FromTTGlyphs(TrueTypeFont *ttf, char buf[bufmax]; snprintf(buf, bufmax, "%%!PS-TrueTypeFont-%d.%d-%d.%d\n", static_cast<int>(ver), static_cast<int>(ver & 0xFF), static_cast<int>(rev>>16), static_cast<int>(rev & 0xFFFF)); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%%%%Creator: %s %s %s\n", modname, modver, modextra); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%%- Font subset generated from a source font file: '%s'\n", ttf->fileName().data()); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%%- Original font name: %s\n", ttf->psname.getStr()); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%%- Original font family: %s\n", ttf->family.getStr()); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "%%- Original font sub-family: %s\n", ttf->subfamily.getStr()); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "11 dict begin\n"); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "/FontName (%s) cvn def\n", psname); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "/PaintType 0 def\n"); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "/FontMatrix [1 0 0 1 0 0] def\n"); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "/FontBBox [%d %d %d %d] def\n", XUnits(UPEm, GetInt16(headP, HEAD_xMin_offset)), XUnits(UPEm, GetInt16(headP, HEAD_yMin_offset)), XUnits(UPEm, GetInt16(headP, HEAD_xMax_offset)), XUnits(UPEm, GetInt16(headP, HEAD_yMax_offset))); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "/FontType 42 def\n"); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "/Encoding 256 array def\n"); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, " 0 1 255 {Encoding exch /.notdef put} for\n"); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); for (i = 1; i<nGlyphs; i++) { snprintf(buf, bufmax, "Encoding %d /glyph%u put\n", encoding[i], gID[i]); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); } snprintf(buf, bufmax, "/XUID [103 0 1 16#%08X %u 16#%08X 16#%08X] def\n", static_cast<unsigned int>(rtl_crc32(0, ttf->ptr, ttf->fsize)), static_cast<unsigned int>(nGlyphs), static_cast<unsigned int>(rtl_crc32(0, glyphArray, nGlyphs * 2)), static_cast<unsigned int>(rtl_crc32(0, encoding, nGlyphs))); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); DumpSfnts(outf, aOutBuffer.data(), aOutBuffer.size()); /* dump charstrings */ snprintf(buf, bufmax, "/CharStrings %d dict dup begin\n", nGlyphs); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "/.notdef 0 def\n"); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); for (i = 1; i < nGlyfCount; i++) { snprintf(buf, bufmax, "/glyph%d %d def\n", i, i); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); } snprintf(buf, bufmax, "end readonly def\n"); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); snprintf(buf, bufmax, "FontName currentdict end definefont pop\n"); - outf->WriteCharPtr(buf); + outf->WriteOString(buf); return SFErrCodes::Ok; } diff --git a/vcl/source/opengl/win/WinDeviceInfo.cxx b/vcl/source/opengl/win/WinDeviceInfo.cxx index ef6a840f533b..bc8a0510027d 100644 --- a/vcl/source/opengl/win/WinDeviceInfo.cxx +++ b/vcl/source/opengl/win/WinDeviceInfo.cxx @@ -191,8 +191,8 @@ OUString getCacheFolder() void writeToLog(SvStream& rStrm, const char* pKey, std::u16string_view rVal) { - rStrm.WriteCharPtr(pKey); - rStrm.WriteCharPtr(": "); + rStrm.WriteOString(pKey); + rStrm.WriteOString(": "); rStrm.WriteOString(OUStringToOString(rVal, RTL_TEXTENCODING_UTF8)); rStrm.WriteChar('\n'); } diff --git a/vcl/source/treelist/imap.cxx b/vcl/source/treelist/imap.cxx index 09cc9f4f0647..5c3b5b0b252a 100644 --- a/vcl/source/treelist/imap.cxx +++ b/vcl/source/treelist/imap.cxx @@ -921,7 +921,7 @@ void ImageMap::Write( SvStream& rOStm ) const rOStm.SetEndian( SvStreamEndian::LITTLE ); // write MagicCode - rOStm.WriteCharPtr( IMAPMAGIC ); + rOStm.WriteOString( IMAPMAGIC ); rOStm.WriteUInt16( IMAGE_MAP_VERSION ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, ""); //dummy |