basic/source/sbx/sbxobj.cxx | 40 +--
basic/source/sbx/sbxvar.cxx | 12
compilerplugins/clang/store/svstreamoutputoperators.cxx | 4
dbaccess/source/ui/misc/TokenWriter.cxx | 174 +++++++-------
desktop/source/app/updater.cxx | 2
editeng/source/editeng/impedit4.cxx | 146 ++++++------
filter/source/msfilter/rtfutil.cxx | 2
idl/source/objects/basobj.cxx | 4
idl/source/objects/object.cxx | 32 +-
idl/source/objects/slot.cxx | 56 ++--
idl/source/objects/types.cxx | 28 +-
idl/source/prj/database.cxx | 8
include/tools/stream.hxx | 1
opencl/source/opencl_device.cxx | 2
sc/source/filter/html/htmlexp.cxx | 186 +++++++--------
sc/source/filter/html/htmlexp2.cxx | 4
sc/source/filter/rtf/rtfexp.cxx | 46 +--
sd/source/filter/html/htmlex.cxx | 2
sfx2/source/bastyp/frmhtmlw.cxx | 16 -
svtools/source/svhtml/HtmlWriter.cxx | 20 -
svtools/source/svhtml/htmlout.cxx | 44 +--
svtools/source/svrtf/rtfout.cxx | 20 -
svx/source/table/tablertfexporter.cxx | 34 +-
sw/qa/unit/swmodeltestbase.cxx | 4
sw/source/core/bastyp/swrect.cxx | 2
sw/source/filter/html/css1atr.cxx | 10
sw/source/filter/html/htmlatr.cxx | 12
sw/source/filter/html/htmlbas.cxx | 4
sw/source/filter/html/htmlforw.cxx | 2
sw/source/filter/html/htmlftn.cxx | 4
sw/source/filter/html/htmlplug.cxx | 6
sw/source/filter/html/htmlreqifreader.cxx | 74 +++---
sw/source/filter/html/wrthtml.cxx | 20 -
sw/source/filter/writer/writer.cxx | 2
sw/source/filter/ww8/rtfattributeoutput.cxx | 194 +++++++---------
sw/source/filter/ww8/rtfexport.cxx | 189 +++++++--------
tools/source/inet/inetstrm.cxx | 4
tools/source/stream/stream.cxx | 12
vcl/skia/SkiaHelper.cxx | 6
vcl/source/filter/eps/eps.cxx | 88 +++----
vcl/source/filter/ipdf/pdfdocument.cxx | 174 +++++++-------
vcl/source/fontsubset/sft.cxx | 100 ++++----
vcl/source/opengl/win/WinDeviceInfo.cxx | 4
vcl/source/treelist/imap.cxx | 2
44 files changed, 891 insertions(+), 905 deletions(-)
New commits:
commit 5fe96b6dcec8f0ccb7c606fa8e981112e6160e7e
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Apr 10 22:43:04 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Apr 10 23:13:32 2023 +0200
Drop SvStream::WriteCharPtr
WriteOString is a better replacement
Change-Id: Ic431b9aeb98d19fe61cff71360eee555105cc2bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150192
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
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('>');
... etc. - the rest is truncated
