summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-01-16 12:40:11 +0200
committerMichael Stahl <mstahl@redhat.com>2014-01-22 22:00:39 +0000
commitd803483f6a5938b0d0708b8db74b30c511dd8e31 (patch)
tree6f75da8815e03744e6ff94f3502a93c896e07bf0
parentdd34ecba1048549d122a759cd5c7f743f5899d73 (diff)
convert more SvStream::operator<< calls
.. to more explicit SvStream::Write* calls This was done using another run of the clang rewriter, and then a lot of hand tweaking to fix all the places where the rewriter did not play nice with various macros. Change-Id: I7bcab93851c8dfb59cde6bc76290c6484d88fb18 Reviewed-on: https://gerrit.libreoffice.org/7494 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--basic/source/runtime/methods1.cxx2
-rw-r--r--connectivity/source/drivers/dbase/dindexnode.cxx2
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx142
-rw-r--r--dbaccess/source/ui/tabledesign/TableRow.cxx2
-rw-r--r--editeng/source/editeng/impedit4.cxx184
-rw-r--r--filter/source/flash/swfwriter2.cxx2
-rw-r--r--filter/source/graphic/GraphicExportFilter.cxx2
-rw-r--r--filter/source/msfilter/escherex.cxx2
-rw-r--r--filter/source/pdf/pdffilter.cxx2
-rw-r--r--idl/source/objects/basobj.cxx71
-rw-r--r--idl/source/objects/bastype.cxx36
-rw-r--r--idl/source/objects/module.cxx58
-rw-r--r--idl/source/objects/object.cxx73
-rw-r--r--idl/source/objects/slot.cxx348
-rw-r--r--idl/source/objects/types.cxx357
-rw-r--r--idl/source/prj/database.cxx28
-rw-r--r--sc/source/filter/excel/xestream.cxx2
-rw-r--r--sc/source/filter/html/htmlexp.cxx66
-rw-r--r--sc/source/filter/html/htmlexp2.cxx8
-rw-r--r--sc/source/filter/rtf/rtfexp.cxx50
-rw-r--r--sc/source/ui/app/drwtrans.cxx2
-rw-r--r--sc/source/ui/app/transobj.cxx2
-rw-r--r--sd/source/ui/app/sdxfer.cxx2
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx28
-rw-r--r--sfx2/source/bastyp/mieclip.cxx4
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx2
-rw-r--r--sfx2/source/doc/oleprops.cxx4
-rw-r--r--svl/source/filerec/filerec.cxx8
-rw-r--r--svl/source/items/cntwall.cxx4
-rw-r--r--svl/source/items/ctypeitm.cxx2
-rw-r--r--svl/source/items/poolio.cxx48
-rw-r--r--svl/source/numbers/zforlist.cxx14
-rw-r--r--svtools/source/graphic/grfattr.cxx2
-rw-r--r--svtools/source/misc/imap.cxx18
-rw-r--r--svtools/source/svhtml/htmlout.cxx80
-rw-r--r--svtools/source/svrtf/rtfout.cxx28
-rw-r--r--svx/source/core/graphichelper.cxx2
-rw-r--r--svx/source/gallery2/galmisc.cxx2
-rw-r--r--svx/source/gallery2/galtheme.cxx14
-rw-r--r--svx/source/items/chrtitem.cxx2
-rw-r--r--svx/source/items/e3ditem.cxx6
-rw-r--r--svx/source/table/tablertfexporter.cxx38
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx2
-rw-r--r--svx/source/xoutdev/xattr.cxx12
-rw-r--r--svx/source/xoutdev/xattr2.cxx12
-rw-r--r--sw/source/filter/html/css1atr.cxx38
-rw-r--r--sw/source/filter/html/htmlatr.cxx78
-rw-r--r--sw/source/filter/html/htmlbas.cxx8
-rw-r--r--sw/source/filter/html/htmlcss1.cxx2
-rw-r--r--sw/source/filter/html/htmlforw.cxx44
-rw-r--r--sw/source/filter/html/htmltabw.cxx18
-rw-r--r--sw/source/filter/html/wrthtml.cxx44
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx212
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx162
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx6
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx4
-rw-r--r--sw/source/ui/config/uinums.cxx58
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx2
-rw-r--r--vcl/source/gdi/impgraph.cxx36
-rw-r--r--writerfilter/source/filter/RtfFilter.cxx2
60 files changed, 1248 insertions, 1241 deletions
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index a2f440c82fe9..af6ae3deda5e 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1043,7 +1043,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
{
pStrm->WriteUInt16( (sal_uInt16)eType ); // VarType Id
}
- *pStrm << rVar.GetDouble();
+ pStrm->WriteDouble( rVar.GetDouble() );
break;
case SbxSTRING:
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index cfa06db4614b..aabc1c1d224e 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -697,7 +697,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
rStream.Write(&buf[0], sizeof(double));
}
else
- rStream << (double) aKey.getValue();
+ rStream.WriteDouble( (double) aKey.getValue() );
}
else
{
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index fc6b67f54c85..29482ed378be 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -373,8 +373,8 @@ sal_Bool ORTFImportExport::Write()
{
SAL_INFO("dbaccess.ui", "ORTFImportExport::Write" );
ODatabaseImportExport::Write();
- (*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << SAL_NEWLINE_STRING;
+ m_pStream->WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF );
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING );
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252;
sal_Bool bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight );
@@ -394,36 +394,36 @@ sal_Bool ORTFImportExport::Write()
aFonts = OUStringToOString(aName, eDestEnc);
}
- (*m_pStream) << "{\\fonttbl";
+ m_pStream->WriteCharPtr( "{\\fonttbl" );
sal_Int32 nTokenCount = comphelper::string::getTokenCount(aFonts, ';');
for(sal_Int32 j=0; j<nTokenCount; ++j)
{
- (*m_pStream) << "\\f";
+ m_pStream->WriteCharPtr( "\\f" );
m_pStream->WriteNumber(j);
- (*m_pStream) << "\\fcharset0\\fnil ";
- (*m_pStream) << comphelper::string::getToken(aFonts, j, ';').getStr();
- (*m_pStream) << ';';
+ m_pStream->WriteCharPtr( "\\fcharset0\\fnil " );
+ m_pStream->WriteCharPtr( comphelper::string::getToken(aFonts, j, ';').getStr() );
+ m_pStream->WriteChar( ';' );
}
- (*m_pStream) << '}' ;
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteChar( '}' ) ;
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
// write the rtf color table
- (*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL << OOO_STRING_SVTOOLS_RTF_RED;
+ m_pStream->WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLORTBL ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RED );
m_pStream->WriteNumber(static_cast<sal_uInt32>(aColor.GetRed()));
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_GREEN;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_GREEN );
m_pStream->WriteNumber(static_cast<sal_uInt32>(aColor.GetGreen()));
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_BLUE;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_BLUE );
m_pStream->WriteNumber(static_cast<sal_uInt32>(aColor.GetBlue()));
- (*m_pStream) << ";\\red255\\green255\\blue255;\\red192\\green192\\blue192;}"
- << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( ";\\red255\\green255\\blue255;\\red192\\green192\\blue192;}" )
+ .WriteCharPtr( SAL_NEWLINE_STRING );
static char const aTRRH[] = "\\trrh-270\\pard\\intbl";
static char const aFS[] = "\\fs20\\f0\\cf0\\cb2";
static char const aCell1[] = "\\clbrdrl\\brdrs\\brdrcf0\\clbrdrt\\brdrs\\brdrcf0\\clbrdrb\\brdrs\\brdrcf0\\clbrdrr\\brdrs\\brdrcf0\\clshdng10000\\clcfpat2\\cellx";
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH );
m_pStream->WriteNumber(static_cast<sal_Int32>(40));
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
if(m_xObject.is())
{
@@ -442,14 +442,14 @@ sal_Bool ORTFImportExport::Write()
for( sal_Int32 i=1; i<=nCount; ++i )
{
- (*m_pStream) << aCell1;
+ m_pStream->WriteCharPtr( aCell1 );
m_pStream->WriteNumber(i*CELL_X);
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
}
// column description
- (*m_pStream) << '{' << SAL_NEWLINE_STRING;
- (*m_pStream) << aTRRH;
+ m_pStream->WriteChar( '{' ).WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteCharPtr( aTRRH );
OString* pHorzChar = new OString[nCount];
@@ -479,28 +479,28 @@ sal_Bool ORTFImportExport::Write()
pHorzChar[i-1] = pChar; // to avoid to always rummage in the ITEMSET later on
- (*m_pStream) << SAL_NEWLINE_STRING;
- (*m_pStream) << '{';
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_QC; // column header always centered
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteChar( '{' );
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QC ); // column header always centered
- if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B;
- if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I;
- if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL;
- if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE;
+ 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 );
- (*m_pStream) << aFS;
- (*m_pStream) << ' ';
+ m_pStream->WriteCharPtr( aFS );
+ m_pStream->WriteChar( ' ' );
RTFOutFuncs::Out_String(*m_pStream,sColumnName,eDestEnc);
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL;
- (*m_pStream) << '}';
- (*m_pStream) << SAL_NEWLINE_STRING;
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL;
+ m_pStream->WriteCharPtr( 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) << OOO_STRING_SVTOOLS_RTF_ROW;
- (*m_pStream) << SAL_NEWLINE_STRING << '}';
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW );
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ).WriteChar( '}' );
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY);
sal_Int32 k=1;
@@ -539,8 +539,8 @@ sal_Bool ORTFImportExport::Write()
delete [] pHorzChar;
}
- (*m_pStream) << '}' << SAL_NEWLINE_STRING;
- (*m_pStream) << (sal_uInt8) 0;
+ m_pStream->WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteUChar( (sal_uInt8) 0 );
return ((*m_pStream).GetError() == SVSTREAM_OK);
}
@@ -549,18 +549,18 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
if(!m_pRowMarker || m_pRowMarker[kk] == k)
{
++kk;
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH;
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH );
m_pStream->WriteNumber(static_cast<sal_Int32>(40));
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
static char const aCell2[] = "\\clbrdrl\\brdrs\\brdrcf2\\clbrdrt\\brdrs\\brdrcf2\\clbrdrb\\brdrs\\brdrcf2\\clbrdrr\\brdrs\\brdrcf2\\clshdng10000\\clcfpat1\\cellx";
static char const aTRRH[] = "\\trrh-270\\pard\\intbl";
for ( sal_Int32 i=1; i<=_nColumnCount; ++i )
{
- (*m_pStream) << aCell2;
+ m_pStream->WriteCharPtr( aCell2 );
m_pStream->WriteNumber(i*CELL_X);
- (*m_pStream) << SAL_NEWLINE_STRING;
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
}
const sal_Bool bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight );
@@ -569,20 +569,20 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
const sal_Bool bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout );
Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY);
- (*m_pStream) << '{';
- (*m_pStream) << aTRRH;
+ m_pStream->WriteChar( '{' );
+ m_pStream->WriteCharPtr( aTRRH );
for ( sal_Int32 i=1; i <= _nColumnCount; ++i )
{
- (*m_pStream) << SAL_NEWLINE_STRING;
- (*m_pStream) << '{';
- (*m_pStream) << pHorzChar[i-1].getStr();
+ m_pStream->WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteChar( '{' );
+ m_pStream->WriteCharPtr( pHorzChar[i-1].getStr() );
- if ( bBold ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_B;
- if ( bItalic ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_I;
- if ( bUnderline ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_UL;
- if ( bStrikeout ) (*m_pStream) << OOO_STRING_SVTOOLS_RTF_STRIKE;
+ 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 );
- (*m_pStream) << "\\fs20\\f1\\cf0\\cb1 ";
+ m_pStream->WriteCharPtr( "\\fs20\\f1\\cf0\\cb1 " );
try
{
@@ -597,13 +597,13 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
SAL_WARN("dbaccess.ui","RTF WRITE!");
}
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL;
- (*m_pStream) << '}';
- (*m_pStream) << SAL_NEWLINE_STRING;
- (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL;
+ m_pStream->WriteCharPtr( 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) << OOO_STRING_SVTOOLS_RTF_ROW << SAL_NEWLINE_STRING;
- (*m_pStream) << '}';
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW ).WriteCharPtr( SAL_NEWLINE_STRING );
+ m_pStream->WriteChar( '}' );
}
++k;
}
@@ -669,7 +669,7 @@ sal_Bool OHTMLImportExport::Write()
ODatabaseImportExport::Write();
if(m_xObject.is())
{
- (*m_pStream) << '<' << OOO_STRING_SVTOOLS_HTML_doctype << ' ' << OOO_STRING_SVTOOLS_HTML_doctype40 << '>' << SAL_NEWLINE_STRING << SAL_NEWLINE_STRING;
+ m_pStream->WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype40 ).WriteChar( '>' ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( SAL_NEWLINE_STRING );
TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html );
WriteHeader();
OUT_LF();
@@ -724,32 +724,32 @@ void OHTMLImportExport::WriteBody()
SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteBody" );
IncIndent(1);
- (*m_pStream) << "<" << OOO_STRING_SVTOOLS_HTML_style << " " << OOO_STRING_SVTOOLS_HTML_O_type << "=\"text/css\">";
+ m_pStream->WriteCharPtr( "<" ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_style ).WriteCharPtr( " " ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_type ).WriteCharPtr( "=\"text/css\">" );
- (*m_pStream) << sMyBegComment; OUT_LF();
- (*m_pStream) << OOO_STRING_SVTOOLS_HTML_body " { " << sFontFamily << '"' << OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()).getStr() << '\"';
+ m_pStream->WriteCharPtr( sMyBegComment ); OUT_LF();
+ m_pStream->WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body ).WriteCharPtr( " { " ).WriteCharPtr( sFontFamily ).WriteChar( '"' ).WriteCharPtr( OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()).getStr() ).WriteChar( '\"' );
// TODO : think about the encoding of the font name
- (*m_pStream) << "; " << sFontSize;
+ m_pStream->WriteCharPtr( "; " ).WriteCharPtr( sFontSize );
m_pStream->WriteNumber(static_cast<sal_Int32>(m_aFont.Height));
- (*m_pStream) << '}';
+ m_pStream->WriteChar( '}' );
OUT_LF();
- (*m_pStream) << sMyEndComment;
+ m_pStream->WriteCharPtr( sMyEndComment );
IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_style );
OUT_LF();
// default Textcolour black
- (*m_pStream) << '<' << OOO_STRING_SVTOOLS_HTML_body << ' ' << OOO_STRING_SVTOOLS_HTML_O_text << '=';
+ m_pStream->WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_text ).WriteChar( '=' );
sal_Int32 nColor = 0;
if(m_xObject.is())
m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor;
::Color aColor(nColor);
HTMLOutFuncs::Out_Color( (*m_pStream), aColor );
- (*m_pStream) << " " OOO_STRING_SVTOOLS_HTML_O_bgcolor "=";
+ m_pStream->WriteCharPtr( " " OOO_STRING_SVTOOLS_HTML_O_bgcolor "=" );
HTMLOutFuncs::Out_Color( (*m_pStream), aColor );
- (*m_pStream) << '>'; OUT_LF();
+ m_pStream->WriteChar( '>' ); OUT_LF();
WriteTables();
@@ -807,7 +807,7 @@ void OHTMLImportExport::WriteTables()
TAG_ON( OOO_STRING_SVTOOLS_HTML_caption );
TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
- (*m_pStream) << OUStringToOString(m_sName, osl_getThreadTextEncoding()).getStr();
+ m_pStream->WriteCharPtr( OUStringToOString(m_sName, osl_getThreadTextEncoding()).getStr() );
// TODO : think about the encoding of the name
TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold );
TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption );
@@ -1022,7 +1022,7 @@ void OHTMLImportExport::FontOn()
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_color;
aStrOut = aStrOut + "=";
- (*m_pStream) << aStrOut.getStr();
+ m_pStream->WriteCharPtr( aStrOut.getStr() );
sal_Int32 nColor = 0;
if(m_xObject.is())
@@ -1030,7 +1030,7 @@ void OHTMLImportExport::FontOn()
::Color aColor(nColor);
HTMLOutFuncs::Out_Color( (*m_pStream), aColor );
- (*m_pStream) << ">";
+ m_pStream->WriteCharPtr( ">" );
}
inline void OHTMLImportExport::FontOff()
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx
index a67cbd48ac23..f996447c49e1 100644
--- a/dbaccess/source/ui/tabledesign/TableRow.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRow.cxx
@@ -113,7 +113,7 @@ namespace dbaui
if ( aValue >>= nValue )
{
_rStr.WriteInt32( sal_Int32(1) );
- _rStr << nValue;
+ _rStr.WriteDouble( nValue );
}
else
{
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 4a0284aae2fd..9178ca396b3d 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -340,11 +340,11 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
// RTF header ...
- rOutput << '{' ;
+ rOutput.WriteChar( '{' ) ;
- rOutput << OOO_STRING_SVTOOLS_RTF_RTF;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF );
- rOutput << OOO_STRING_SVTOOLS_RTF_ANSI;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI );
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252;
// Generate and write out Font table ...
@@ -379,32 +379,33 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
}
}
- rOutput << endl << '{' << OOO_STRING_SVTOOLS_RTF_FONTTBL;
+ rOutput << endl;
+ rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FONTTBL );
sal_uInt16 j;
for ( j = 0; j < aFontTable.size(); j++ )
{
SvxFontItem* pFontItem = aFontTable[ j ];
- rOutput << '{';
- rOutput << OOO_STRING_SVTOOLS_RTF_F;
+ rOutput.WriteChar( '{' );
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_F );
rOutput.WriteNumber( static_cast<sal_uInt32>( j ) );
switch ( pFontItem->GetFamily() )
{
- case FAMILY_DONTKNOW: rOutput << OOO_STRING_SVTOOLS_RTF_FNIL;
+ case FAMILY_DONTKNOW: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FNIL );
break;
- case FAMILY_DECORATIVE: rOutput << OOO_STRING_SVTOOLS_RTF_FDECOR;
+ case FAMILY_DECORATIVE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FDECOR );
break;
- case FAMILY_MODERN: rOutput << OOO_STRING_SVTOOLS_RTF_FMODERN;
+ case FAMILY_MODERN: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FMODERN );
break;
- case FAMILY_ROMAN: rOutput << OOO_STRING_SVTOOLS_RTF_FROMAN;
+ case FAMILY_ROMAN: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FROMAN );
break;
- case FAMILY_SCRIPT: rOutput << OOO_STRING_SVTOOLS_RTF_FSCRIPT;
+ case FAMILY_SCRIPT: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FSCRIPT );
break;
- case FAMILY_SWISS: rOutput << OOO_STRING_SVTOOLS_RTF_FSWISS;
+ case FAMILY_SWISS: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FSWISS );
break;
default:
break;
}
- rOutput << OOO_STRING_SVTOOLS_RTF_FPRQ;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FPRQ );
sal_uInt16 nVal = 0;
switch( pFontItem->GetPitch() )
{
@@ -419,14 +420,14 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
DBG_ASSERT( eChrSet != 9, "SystemCharSet?!" );
if( RTL_TEXTENCODING_DONTKNOW == eChrSet )
eChrSet = osl_getThreadTextEncoding();
- rOutput << OOO_STRING_SVTOOLS_RTF_FCHARSET;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FCHARSET );
rOutput.WriteNumber( static_cast<sal_uInt32>( rtl_getBestWindowsCharsetFromTextEncoding( eChrSet ) ) );
- rOutput << ' ';
+ rOutput.WriteChar( ' ' );
RTFOutFuncs::Out_String( rOutput, pFontItem->GetFamilyName(), eDestEnc );
- rOutput << ";}";
+ rOutput.WriteCharPtr( ";}" );
}
- rOutput << '}';
+ rOutput.WriteChar( '}' );
rOutput << endl;
// Write out ColorList ...
@@ -443,22 +444,22 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
}
aColorList.Insert( new SvxColorItem( (const SvxColorItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_COLOR) ), i );
- rOutput << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL;
+ rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLORTBL );
for ( j = 0; j < aColorList.Count(); j++ )
{
pColorItem = aColorList.GetObject( j );
if ( !j || ( pColorItem->GetValue() != COL_AUTO ) )
{
- rOutput << OOO_STRING_SVTOOLS_RTF_RED;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RED );
rOutput.WriteNumber( static_cast<sal_uInt32>(pColorItem->GetValue().GetRed()) );
- rOutput << OOO_STRING_SVTOOLS_RTF_GREEN;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_GREEN );
rOutput.WriteNumber( static_cast<sal_uInt32>(pColorItem->GetValue().GetGreen()) );
- rOutput << OOO_STRING_SVTOOLS_RTF_BLUE;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_BLUE );
rOutput.WriteNumber( static_cast<sal_uInt32>(pColorItem->GetValue().GetBlue()) );
}
- rOutput << ';';
+ rOutput.WriteChar( ';' );
}
- rOutput << '}';
+ rOutput.WriteChar( '}' );
rOutput << endl;
// StyleSheets...
@@ -467,14 +468,15 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
sal_uInt16 nStyles = (sal_uInt16)GetStyleSheetPool()->GetStyles().size();
if ( nStyles )
{
- rOutput << '{' << OOO_STRING_SVTOOLS_RTF_STYLESHEET;
+ rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STYLESHEET );
for ( sal_uInt16 nStyle = 0; nStyle < nStyles; nStyle++ )
{
SfxStyleSheet* pStyle = (SfxStyleSheet*)GetStyleSheetPool()->GetStyles()[ nStyle ].get();
- rOutput << endl << '{' << OOO_STRING_SVTOOLS_RTF_S;
+ rOutput << endl;
+ rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_S );
sal_uInt32 nNumber = nStyle + 1;
rOutput.WriteNumber( nNumber );
@@ -493,7 +495,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
{
SfxStyleSheet* pParent = (SfxStyleSheet*)GetStyleSheetPool()->Find( pStyle->GetParent(), pStyle->GetFamily() );
DBG_ASSERT( pParent, "Parent not found!" );
- rOutput << OOO_STRING_SVTOOLS_RTF_SBASEDON;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SBASEDON );
nNumber = getStylePos( GetStyleSheetPool()->GetStyles(), pParent ) + 1;
rOutput.WriteNumber( nNumber );
}
@@ -504,39 +506,39 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
pNext = (SfxStyleSheet*)GetStyleSheetPool()->Find( pStyle->GetFollow(), pStyle->GetFamily() );
DBG_ASSERT( pNext, "Next ot found!" );
- rOutput << OOO_STRING_SVTOOLS_RTF_SNEXT;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SNEXT );
nNumber = getStylePos( GetStyleSheetPool()->GetStyles(), pNext ) + 1;
rOutput.WriteNumber( nNumber );
// Name of the template ...
- rOutput << " " << OUStringToOString(pStyle->GetName(), eDestEnc).getStr();
- rOutput << ";}";
+ rOutput.WriteCharPtr( " " ).WriteCharPtr( OUStringToOString(pStyle->GetName(), eDestEnc).getStr() );
+ rOutput.WriteCharPtr( ";}" );
}
- rOutput << '}';
+ rOutput.WriteChar( '}' );
rOutput << endl;
}
}
// Write the pool defaults in advance ...
- rOutput << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << "\\EditEnginePoolDefaults";
+ rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( "\\EditEnginePoolDefaults" );
for ( sal_uInt16 nPoolDefItem = EE_PARA_START; nPoolDefItem <= EE_CHAR_END; nPoolDefItem++)
{
const SfxPoolItem& rItem = aEditDoc.GetItemPool().GetDefaultItem( nPoolDefItem );
WriteItemAsRTF( rItem, rOutput, 0, 0, aFontTable, aColorList );
}
- rOutput << '}' << endl;
+ rOutput.WriteChar( '}' ) << endl;
// DefTab:
MapMode aTwpMode( MAP_TWIP );
sal_uInt16 nDefTabTwps = (sal_uInt16) GetRefDevice()->LogicToLogic(
Point( aEditDoc.GetDefTab(), 0 ),
&GetRefMapMode(), &aTwpMode ).X();
- rOutput << OOO_STRING_SVTOOLS_RTF_DEFTAB;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_DEFTAB );
rOutput.WriteNumber( static_cast<sal_uInt32>( nDefTabTwps ) );
rOutput << endl;
// iterate over the paragraphs ...
- rOutput << '{' << endl;
+ rOutput.WriteChar( '{' ) << endl;
for ( sal_Int32 nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
@@ -549,7 +551,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
if ( pNode->GetStyleSheet() )
{
// Number of template
- rOutput << OOO_STRING_SVTOOLS_RTF_S;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_S );
sal_uInt32 nNumber = getStylePos( GetStyleSheetPool()->GetStyles(), pNode->GetStyleSheet() ) + 1;
rOutput.WriteNumber( nNumber );
@@ -577,7 +579,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
}
}
if ( bAttr )
- rOutput << ' '; // Separator
+ rOutput.WriteChar( ' ' ); // Separator
ItemList aAttribItems;
ParaPortion* pParaPortion = FindParaPortion( pNode );
@@ -602,7 +604,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
if ( aAttribItems.Count() )
{
// These attributes may not apply to the entire paragraph:
- rOutput << '{';
+ rOutput.WriteChar( '{' );
WriteItemListAsRTF( aAttribItems, rOutput, nNode, nStartPos, aFontTable, aColorList );
bFinishPortion = sal_True;
}
@@ -647,9 +649,9 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
// Insert hard attribs AFTER CJK attribs...
lcl_FindValidAttribs( aAttribItems, pNode, nIndex, nScriptType );
- rOutput << '{';
+ rOutput.WriteChar( '{' );
if ( WriteItemListAsRTF( aAttribItems, rOutput, nNode, nIndex, aFontTable, aColorList ) )
- rOutput << ' ';
+ rOutput.WriteChar( ' ' );
sal_uInt16 nS = nIndex;
sal_uInt16 nE = nIndex + pTextPortion->GetLen();
@@ -660,22 +662,22 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
OUString aRTFStr = aEditDoc.GetParaAsString( pNode, nS, nE);
RTFOutFuncs::Out_String( rOutput, aRTFStr, eDestEnc );
- rOutput << '}';
+ rOutput.WriteChar( '}' );
}
if ( bFinishPortion )
{
- rOutput << '}';
+ rOutput.WriteChar( '}' );
bFinishPortion = sal_False;
}
nIndex = nIndex + pTextPortion->GetLen();
}
- rOutput << OOO_STRING_SVTOOLS_RTF_PAR << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN;;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAR ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN );
rOutput << endl;
}
// RTF-trailer ...
- rOutput << "}}"; // 1xparentheses paragraphs, 1xparentheses RTF document
+ rOutput.WriteCharPtr( "}}" ); // 1xparentheses paragraphs, 1xparentheses RTF document
rOutput.Flush();
std::vector<SvxFontItem*>::iterator it;
@@ -696,9 +698,9 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
{
const SvxFrameDirectionItem& rWritingMode = (const SvxFrameDirectionItem&)rItem;
if ( rWritingMode.GetValue() == FRMDIR_HORI_RIGHT_TOP )
- rOutput << "\\rtlpar";
+ rOutput.WriteCharPtr( "\\rtlpar" );
else
- rOutput << "\\ltrpar";
+ rOutput.WriteCharPtr( "\\ltrpar" );
}
break;
case EE_PARA_OUTLLEVEL:
@@ -706,7 +708,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
sal_Int32 nLevel = ((const SfxInt16Item&)rItem).GetValue();
if( nLevel >= 0 )
{
- rOutput << "\\level";
+ rOutput.WriteCharPtr( "\\level" );
rOutput.WriteNumber( nLevel );
}
}
@@ -714,15 +716,15 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
case EE_PARA_OUTLLRSPACE:
case EE_PARA_LRSPACE:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_FI;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FI );
sal_Int32 nTxtFirst = ((const SvxLRSpaceItem&)rItem).GetTxtFirstLineOfst();
nTxtFirst = LogicToTwips( nTxtFirst );
rOutput.WriteNumber( nTxtFirst );
- rOutput << OOO_STRING_SVTOOLS_RTF_LI;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LI );
sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(((const SvxLRSpaceItem&)rItem).GetTxtLeft());
nTxtLeft = (sal_uInt32)LogicToTwips( nTxtLeft );
rOutput.WriteNumber( nTxtLeft );
- rOutput << OOO_STRING_SVTOOLS_RTF_RI;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RI );
sal_uInt32 nTxtRight = ((const SvxLRSpaceItem&)rItem).GetRight();
nTxtRight = LogicToTwips( nTxtRight);
rOutput.WriteNumber( nTxtRight );
@@ -730,11 +732,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
break;
case EE_PARA_ULSPACE:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_SB;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SB );
sal_uInt32 nUpper = ((const SvxULSpaceItem&)rItem).GetUpper();
nUpper = (sal_uInt32)LogicToTwips( nUpper );
rOutput.WriteNumber( nUpper );
- rOutput << OOO_STRING_SVTOOLS_RTF_SA;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SA );
sal_uInt32 nLower = ((const SvxULSpaceItem&)rItem).GetLower();
nLower = LogicToTwips( nLower );
rOutput.WriteNumber( nLower );
@@ -742,7 +744,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
break;
case EE_PARA_SBL:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_SL;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SL );
sal_Int32 nVal = ((const SvxLineSpacingItem&)rItem).GetLineHeight();
char cMult = '0';
if ( ((const SvxLineSpacingItem&)rItem).GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
@@ -755,7 +757,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
cMult = '1';
}
rOutput.WriteNumber( nVal );
- rOutput << OOO_STRING_SVTOOLS_RTF_SLMULT << cMult;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SLMULT ).WriteChar( cMult );
}
break;
case EE_PARA_JUST:
@@ -763,11 +765,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
SvxAdjust eJustification = ((const SvxAdjustItem&)rItem).GetAdjust();
switch ( eJustification )
{
- case SVX_ADJUST_CENTER: rOutput << OOO_STRING_SVTOOLS_RTF_QC;
+ case SVX_ADJUST_CENTER: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QC );
break;
- case SVX_ADJUST_RIGHT: rOutput << OOO_STRING_SVTOOLS_RTF_QR;
+ case SVX_ADJUST_RIGHT: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QR );
break;
- default: rOutput << OOO_STRING_SVTOOLS_RTF_QL;
+ default: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_QL );
break;
}
}
@@ -778,7 +780,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
for ( sal_uInt16 i = 0; i < rTabs.Count(); i++ )
{
const SvxTabStop& rTab = rTabs[i];
- rOutput << OOO_STRING_SVTOOLS_RTF_TX;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TX );
rOutput.WriteNumber( LogicToTwips( rTab.GetTabPos() ) );
}
}
@@ -786,7 +788,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
case EE_CHAR_COLOR:
{
sal_uInt32 n = rColorList.GetId( (const SvxColorItem&)rItem );
- rOutput << OOO_STRING_SVTOOLS_RTF_CF;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CF );
rOutput.WriteNumber( n );
}
break;
@@ -804,7 +806,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
}
}
- rOutput << OOO_STRING_SVTOOLS_RTF_F;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_F );
rOutput.WriteNumber( n );
}
break;
@@ -812,7 +814,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
case EE_CHAR_FONTHEIGHT_CJK:
case EE_CHAR_FONTHEIGHT_CTL:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_FS;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FS );
sal_Int32 nHeight = ((const SvxFontHeightItem&)rItem).GetHeight();
nHeight = LogicToTwips( nHeight );
// Twips => HalfPoints
@@ -827,8 +829,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
FontWeight e = ((const SvxWeightItem&)rItem).GetWeight();
switch ( e )
{
- case WEIGHT_BOLD: rOutput << OOO_STRING_SVTOOLS_RTF_B; break;
- default: rOutput << OOO_STRING_SVTOOLS_RTF_B << '0'; break;
+ case WEIGHT_BOLD: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B ); break;
+ default: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B ).WriteChar( '0' ); break;
}
}
break;
@@ -839,10 +841,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
FontUnderline e = ((const SvxUnderlineItem&)rItem).GetLineStyle();
switch ( e )
{
- case UNDERLINE_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_ULNONE; break;
- case UNDERLINE_SINGLE: rOutput << OOO_STRING_SVTOOLS_RTF_UL; break;
- case UNDERLINE_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_ULDB; break;
- case UNDERLINE_DOTTED: rOutput << OOO_STRING_SVTOOLS_RTF_ULD; break;
+ case UNDERLINE_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULNONE ); break;
+ case UNDERLINE_SINGLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL ); break;
+ case UNDERLINE_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULDB ); break;
+ case UNDERLINE_DOTTED: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULD ); break;
default:
break;
}
@@ -853,10 +855,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
FontUnderline e = ((const SvxOverlineItem&)rItem).GetLineStyle();
switch ( e )
{
- case UNDERLINE_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_OLNONE; break;
- case UNDERLINE_SINGLE: rOutput << OOO_STRING_SVTOOLS_RTF_OL; break;
- case UNDERLINE_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_OLDB; break;
- case UNDERLINE_DOTTED: rOutput << OOO_STRING_SVTOOLS_RTF_OLD; break;
+ case UNDERLINE_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLNONE ); break;
+ case UNDERLINE_SINGLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OL ); break;
+ case UNDERLINE_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLDB ); break;
+ case UNDERLINE_DOTTED: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLD ); break;
default:
break;
}
@@ -868,8 +870,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
switch ( e )
{
case STRIKEOUT_SINGLE:
- case STRIKEOUT_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_STRIKE; break;
- case STRIKEOUT_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_STRIKE << '0'; break;
+ case STRIKEOUT_DOUBLE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STRIKE ); break;
+ case STRIKEOUT_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_STRIKE ).WriteChar( '0' ); break;
default:
break;
}
@@ -883,8 +885,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
switch ( e )
{
case ITALIC_OBLIQUE:
- case ITALIC_NORMAL: rOutput << OOO_STRING_SVTOOLS_RTF_I; break;
- case ITALIC_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_I << '0'; break;
+ case ITALIC_NORMAL: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I ); break;
+ case ITALIC_NONE: rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I ).WriteChar( '0' ); break;
default:
break;
}
@@ -892,58 +894,58 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
break;
case EE_CHAR_OUTLINE:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_OUTL;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OUTL );
if ( !((const SvxContourItem&)rItem).GetValue() )
- rOutput << '0';
+ rOutput.WriteChar( '0' );
}
break;
case EE_CHAR_RELIEF:
{
sal_uInt16 nRelief = ((const SvxCharReliefItem&)rItem).GetValue();
if ( nRelief == RELIEF_EMBOSSED )
- rOutput << OOO_STRING_SVTOOLS_RTF_EMBO;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_EMBO );
if ( nRelief == RELIEF_ENGRAVED )
- rOutput << OOO_STRING_SVTOOLS_RTF_IMPR;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IMPR );
}
break;
case EE_CHAR_EMPHASISMARK:
{
sal_uInt16 nMark = ((const SvxEmphasisMarkItem&)rItem).GetValue();
if ( nMark == EMPHASISMARK_NONE )
- rOutput << OOO_STRING_SVTOOLS_RTF_ACCNONE;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCNONE );
else if ( nMark == EMPHASISMARK_SIDE_DOTS )
- rOutput << OOO_STRING_SVTOOLS_RTF_ACCCOMMA;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCCOMMA );
else
- rOutput << OOO_STRING_SVTOOLS_RTF_ACCDOT;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ACCDOT );
}
break;
case EE_CHAR_SHADOW:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_SHAD;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHAD );
if ( !((const SvxShadowedItem&)rItem).GetValue() )
- rOutput << '0';
+ rOutput.WriteChar( '0' );
}
break;
case EE_FEATURE_TAB:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_TAB;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TAB );
}
break;
case EE_FEATURE_LINEBR:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_SL;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SL );
}
break;
case EE_CHAR_KERNING:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_EXPNDTW;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_EXPNDTW );
rOutput.WriteNumber( LogicToTwips(
((const SvxKerningItem&)rItem).GetValue() ) );
}
break;
case EE_CHAR_PAIRKERNING:
{
- rOutput << OOO_STRING_SVTOOLS_RTF_KERNING;
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_KERNING );
rOutput.WriteNumber( static_cast<sal_uInt32>(((const SvxAutoKernItem&)rItem).GetValue() ? 1 : 0 ));
}
break;
@@ -972,16 +974,16 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
// SWG:
if ( nEsc )
{
- rOutput << "{\\*\\updnprop" << OString::number(
- nProp100).getStr() << '}';
+ rOutput.WriteCharPtr( "{\\*\\updnprop" ).WriteCharPtr( OString::number(
+ nProp100).getStr() ).WriteChar( '}' );
}
long nUpDown = nFontHeight * std::abs( nEsc ) / 100;
OString aUpDown = OString::number(
nUpDown);
if ( nEsc < 0 )
- rOutput << OOO_STRING_SVTOOLS_RTF_DN << aUpDown.getStr();
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_DN ).WriteCharPtr( aUpDown.getStr() );
else if ( nEsc > 0 )
- rOutput << OOO_STRING_SVTOOLS_RTF_UP << aUpDown.getStr();
+ rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UP ).WriteCharPtr( aUpDown.getStr() );
}
break;
}
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index d8d21f05c074..9c9599faf1f6 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -358,7 +358,7 @@ void Tag::addString( const char* pString )
void Tag::addStream( SvStream& rIn )
{
- *this << rIn;
+ (*this).WriteStream( rIn );
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx
index 57774aab33a9..287f9b79a8a2 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -132,7 +132,7 @@ sal_Bool SAL_CALL GraphicExportFilter::filter( const Sequence<PropertyValue>& rD
{
SvOutputStream aOutputStream( mxOutputStream );
aMemStream.Seek(0);
- aOutputStream << aMemStream;
+ aOutputStream.WriteStream( aMemStream );
return true;
}
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 129831e396f2..d8ed47f507d0 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4035,7 +4035,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject
.WriteInt16( pGraphicAttr->GetChannelR() )
.WriteInt16( pGraphicAttr->GetChannelG() )
.WriteInt16( pGraphicAttr->GetChannelB() )
- << pGraphicAttr->GetGamma();
+ .WriteDouble( pGraphicAttr->GetGamma() );
aSt.WriteUChar( (sal_Bool)( pGraphicAttr->IsInvert() == sal_True ) )
.WriteUChar( pGraphicAttr->GetTransparency() );
mnIdentifier[ 1 ] = rtl_crc32( 0, aSt.GetData(), aSt.Tell() );
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 2db9df8ac26e..77bd2a47e57e 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -118,7 +118,7 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
{
SvOutputStream aOStm( xOStm );
- aOStm << *pIStm;
+ aOStm.WriteStream( *pIStm );
bRet = ( aOStm.Tell() && ( aOStm.GetError() == ERRCODE_NONE ) );
delete pIStm;
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index c305b517c11c..8ca2ca85501e 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -44,15 +44,15 @@ void SvMetaObject::Save( SvPersistStream & )
void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab )
{
while( nTab-- )
- rOutStm << " ";
+ rOutStm.WriteCharPtr( " " );
}
void SvMetaObject::WriteStars( SvStream & rOutStm )
{
- rOutStm << '/';
+ rOutStm.WriteChar( '/' );
for( int i = 6; i > 0; i-- )
- rOutStm << "**********";
- rOutStm << '/' << endl;
+ rOutStm.WriteCharPtr( "**********" );
+ rOutStm.WriteChar( '/' ) << endl;
}
sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos )
@@ -144,7 +144,7 @@ void SvMetaName::Save( SvPersistStream & rStm )
if( aConfigName.IsSet() ) nMask |= 0x08;
if( aDescription.IsSet() ) nMask |= 0x10;
- rStm << nMask;
+ rStm.WriteUChar( nMask );
if( nMask & 0x01 ) WriteSvString( rStm, aName );
if( nMask & 0x02 ) WriteSvNumberIdentifier( rStm, aHelpContext );
if( nMask & 0x04 ) WriteSvString( rStm, aHelpText );
@@ -219,18 +219,19 @@ void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 )
void SvMetaName::WriteDescription( SvStream & rOutStm )
{
- rOutStm << "<DESCRIPTION>" << endl;
+ rOutStm.WriteCharPtr( "<DESCRIPTION>" ) << endl;
OString aDesc( GetDescription().getString() );
sal_Int32 nPos = aDesc.indexOf('\n');
while ( nPos != -1 )
{
- rOutStm << aDesc.copy( 0, nPos ).getStr() << endl;
+ rOutStm.WriteCharPtr( aDesc.copy( 0, nPos ).getStr() ) << endl;
aDesc = aDesc.copy(nPos+1);
nPos = aDesc.indexOf('\n');
}
- rOutStm << aDesc.getStr() << endl << "</DESCRIPTION>" << endl;
+ rOutStm.WriteCharPtr( aDesc.getStr() ) << endl;
+ rOutStm.WriteCharPtr( "</DESCRIPTION>" ) << endl;
}
void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
@@ -240,25 +241,25 @@ void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
if( aHelpContext.IsSet() || aHelpText.IsSet() || aConfigName.IsSet() )
{
WriteTab( rOutStm, nTab );
- rOutStm << "// class SvMetaName" << endl;
+ rOutStm.WriteCharPtr( "// class SvMetaName" ) << endl;
}
if( aHelpContext.IsSet() )
{
WriteTab( rOutStm, nTab );
aHelpContext.WriteSvIdl( SvHash_HelpContext(), rOutStm, nTab );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( aHelpText.IsSet() )
{
WriteTab( rOutStm, nTab );
aHelpText.WriteSvIdl( rBase, rOutStm, nTab );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( aConfigName.IsSet() )
{
WriteTab( rOutStm, nTab );
aConfigName.WriteSvIdl( SvHash_ConfigName(), rOutStm, nTab );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
}
@@ -297,7 +298,7 @@ void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
{
sal_uLong nBeginPos = rOutStm.Tell();
WriteTab( rOutStm, nTab );
- rOutStm << '[' << endl;
+ rOutStm.WriteChar( '[' ) << endl;
sal_uLong nOldPos = rOutStm.Tell();
WriteAttributesSvIdl( rBase, rOutStm, nTab +1 );
@@ -308,13 +309,13 @@ void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
else
{
WriteTab( rOutStm, nTab );
- rOutStm << ']';
+ rOutStm.WriteChar( ']' );
nBeginPos = rOutStm.Tell();
rOutStm << endl;
}
WriteTab( rOutStm, nTab );
- rOutStm << '{' << endl;
+ rOutStm.WriteChar( '{' ) << endl;
nOldPos = rOutStm.Tell();
WriteContextSvIdl( rBase, rOutStm, nTab +1 );
@@ -325,7 +326,7 @@ void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
else
{
WriteTab( rOutStm, nTab );
- rOutStm << '}';
+ rOutStm.WriteChar( '}' );
}
}
@@ -335,7 +336,7 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
sal_uLong nBeginPos = rOutStm.Tell();
WriteTab( rOutStm, nTab );
- rOutStm << '[' << endl;
+ rOutStm.WriteChar( '[' ) << endl;
sal_uLong nOldPos = rOutStm.Tell();
WriteAttributes( rBase, rOutStm, nTab +1, nT, nA );
@@ -357,7 +358,7 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
rOutStm.Seek( nPos );
WriteTab( rOutStm, nTab );
- rOutStm << ']' << endl;
+ rOutStm.WriteChar( ']' ) << endl;
}
}
@@ -368,19 +369,19 @@ void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
if( GetHelpText().IsSet() || GetHelpContext().IsSet() )
{
WriteTab( rOutStm, nTab );
- rOutStm << "// class SvMetaName" << endl;
+ rOutStm.WriteCharPtr( "// class SvMetaName" ) << endl;
}
if( GetHelpText().IsSet() )
{
WriteTab( rOutStm, nTab );
- rOutStm << "helpstring(\"" << GetHelpText().getString().getStr() << "\")," << endl;
+ rOutStm.WriteCharPtr( "helpstring(\"" ).WriteCharPtr( GetHelpText().getString().getStr() ).WriteCharPtr( "\")," ) << endl;
}
if( GetHelpContext().IsSet() )
{
WriteTab( rOutStm, nTab );
- rOutStm << "helpcontext("
- << OString::number(GetHelpContext().GetValue()).getStr()
- << ")," << endl;
+ rOutStm.WriteCharPtr( "helpcontext(" )
+ .WriteCharPtr( OString::number(GetHelpContext().GetValue()).getStr() )
+ .WriteCharPtr( ")," ) << endl;
}
}
@@ -426,7 +427,7 @@ void SvMetaReference::Save( SvPersistStream & rStm )
nMask |= 0x01;
// write data
- rStm << nMask;
+ rStm.WriteUChar( nMask );
if( nMask & 0x01 ) WriteSvPersistBase( rStm, aRef );
}
@@ -471,7 +472,7 @@ void SvMetaExtern::Save( SvPersistStream & rStm )
if( bReadVersion ) nMask |= 0x10;
// write data
- rStm << nMask;
+ rStm.WriteUChar( nMask );
if( nMask & 0x01 ) WriteSvPersistBase( rStm, pModule );
if( nMask & 0x02 ) WriteSvGlobalName( rStm, aUUId );
if( nMask & 0x04 ) WriteSvVersion( rStm, aVersion );
@@ -512,19 +513,19 @@ void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase,
if( bReadUUId || bReadVersion )
{
WriteTab( rOutStm, nTab );
- rOutStm << "// class SvMetaExtern" << endl;
+ rOutStm.WriteCharPtr( "// class SvMetaExtern" ) << endl;
if( bReadUUId )
{
WriteTab( rOutStm, nTab );
aUUId.WriteSvIdl( rOutStm );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( bReadVersion )
{
WriteTab( rOutStm, nTab );
aVersion.WriteSvIdl( rOutStm );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
}
}
@@ -556,15 +557,15 @@ void SvMetaExtern::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaReference::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
WriteTab( rOutStm, nTab );
- rOutStm << "// class SvMetaExtern" << endl;
+ rOutStm.WriteCharPtr( "// class SvMetaExtern" ) << endl;
WriteTab( rOutStm, nTab );
- rOutStm << "uuid(" << OUStringToOString(GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << ")," << endl;
+ rOutStm.WriteCharPtr( "uuid(" ).WriteCharPtr( OUStringToOString(GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8).getStr() ).WriteCharPtr( ")," ) << endl;
WriteTab( rOutStm, nTab );
- rOutStm << "version("
- << OString::number(aVersion.GetMajorVersion()).getStr()
- << '.'
- << OString::number(aVersion.GetMinorVersion()).getStr()
- << ")," << endl;
+ rOutStm.WriteCharPtr( "version(" )
+ .WriteCharPtr( OString::number(aVersion.GetMajorVersion()).getStr() )
+ .WriteChar( '.' )
+ .WriteCharPtr( OString::number(aVersion.GetMinorVersion()).getStr() )
+ .WriteCharPtr( ")," ) << endl;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index bccb4e64567a..7f517e7f4632 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -71,7 +71,7 @@ SvStream& WriteSvBOOL(SvStream & rStm, const SvBOOL & rb )
sal_uInt8 n = rb.nVal;
if( rb.bSet )
n |= 0x02;
- rStm << n;
+ rStm.WriteUChar( n );
return rStm;
}
SvStream& operator >> (SvStream & rStm, SvBOOL & rb )
@@ -98,13 +98,13 @@ SvStream& WriteSvVersion(SvStream & rStm, const SvVersion & r )
int n = r.GetMajorVersion() << 4;
n |= r.GetMinorVersion();
- rStm << (sal_uInt8)n;
+ rStm.WriteUChar( (sal_uInt8)n );
}
else
{
- rStm << (sal_uInt8)0;
- rStm << r.GetMajorVersion();
- rStm << r.GetMinorVersion();
+ rStm.WriteUChar( (sal_uInt8)0 );
+ rStm.WriteUInt16( r.GetMajorVersion() );
+ rStm.WriteUInt16( r.GetMinorVersion() );
}
return rStm;
}
@@ -160,9 +160,9 @@ sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
{
if( nVal )
- rOutStm << pName->GetName().getStr();
+ rOutStm.WriteCharPtr( pName->GetName().getStr() );
else
- rOutStm << pName->GetName().getStr() << "(FALSE)";
+ rOutStm.WriteCharPtr( pName->GetName().getStr() ).WriteCharPtr( "(FALSE)" );
return sal_True;
}
@@ -207,8 +207,8 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
SvStream & rOutStm,
sal_uInt16 /*nTab */ )
{
- rOutStm << pName->GetName().getStr() << '(';
- rOutStm << getString().getStr() << ')';
+ rOutStm.WriteCharPtr( pName->GetName().getStr() ).WriteChar( '(' );
+ rOutStm.WriteCharPtr( getString().getStr() ).WriteChar( ')' );
return sal_True;
}
@@ -320,8 +320,8 @@ sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
sal_uInt16 /*nTab */ )
{
- rOutStm << pName->GetName().getStr() << "(\"";
- rOutStm << m_aStr.getStr() << "\")";
+ rOutStm.WriteCharPtr( pName->GetName().getStr() ).WriteCharPtr( "(\"" );
+ rOutStm.WriteCharPtr( m_aStr.getStr() ).WriteCharPtr( "\")" );
return sal_True;
}
@@ -378,8 +378,8 @@ sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
{
// write global id
- rOutStm << SvHash_uuid()->GetName().getStr() << "(\"";
- rOutStm << OUStringToOString(GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << "\")";
+ rOutStm.WriteCharPtr( SvHash_uuid()->GetName().getStr() ).WriteCharPtr( "(\"" );
+ rOutStm.WriteCharPtr( OUStringToOString(GetHexName(), RTL_TEXTENCODING_UTF8).getStr() ).WriteCharPtr( "\")" );
return sal_True;
}
@@ -410,11 +410,11 @@ sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
sal_Bool SvVersion::WriteSvIdl( SvStream & rOutStm )
{
- rOutStm << SvHash_Version()->GetName().getStr() << '('
- << OString::number(nMajorVersion).getStr()
- << '.'
- << OString::number(nMinorVersion).getStr()
- << ')';
+ rOutStm.WriteCharPtr( SvHash_Version()->GetName().getStr() ).WriteChar( '(' )
+ .WriteCharPtr( OString::number(nMajorVersion).getStr() )
+ .WriteChar( '.' )
+ .WriteCharPtr( OString::number(nMinorVersion).getStr() )
+ .WriteChar( ')' );
return sal_True;
}
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 2bd822db0a2d..ac9aed0930f9 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -75,7 +75,7 @@ void SvMetaModule::Save( SvPersistStream & rStm )
{
SvMetaExtern::Save( rStm );
- rStm << (sal_uInt16)(MODULE_VER | IDL_WRITE_COMPILER); // Version
+ rStm.WriteUInt16( (sal_uInt16)(MODULE_VER | IDL_WRITE_COMPILER) ); // Version
WriteSvDeclPersistList( rStm, aClassList );
WriteSvDeclPersistList( rStm, aTypeList );
@@ -89,14 +89,14 @@ void SvMetaModule::Save( SvPersistStream & rStm )
// write compiler data
sal_uInt16 nCmpLen = 0;
sal_uLong nLenPos = rStm.Tell();
- rStm << nCmpLen;
+ rStm.WriteUInt16( nCmpLen );
WriteSvGlobalName( rStm, aBeginName );
WriteSvGlobalName( rStm, aEndName );
WriteSvGlobalName( rStm, aNextName );
// write length of compiler data
sal_uLong nPos = rStm.Tell();
rStm.Seek( nLenPos );
- rStm << (sal_uInt16)( nPos - nLenPos - sizeof( sal_uInt16 ) );
+ rStm.WriteUInt16( (sal_uInt16)( nPos - nLenPos - sizeof( sal_uInt16 ) ) );
rStm.Seek( nPos );
}
@@ -157,19 +157,19 @@ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase,
{
WriteTab( rOutStm, nTab );
aHelpFileName.WriteSvIdl( SvHash_HelpFile(), rOutStm, nTab +1 );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( !aSlotIdFile.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
aSlotIdFile.WriteSvIdl( SvHash_SlotIdFile(), rOutStm, nTab +1 );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( !aTypeLibFile.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
aTypeLibFile.WriteSvIdl( SvHash_TypeLibFile(), rOutStm, nTab +1 );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
}
}
@@ -356,12 +356,13 @@ sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm
void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab )
{
- rOutStm << SvHash_module()->GetName().getStr() << endl
- << '\"';
+ rOutStm.WriteCharPtr( SvHash_module()->GetName().getStr() ) << endl;
+ rOutStm.WriteChar( '\"' );
rOutStm.WriteUniOrByteString( aBeginName.GetHexName(), rOutStm.GetStreamCharSet() );
- rOutStm << '\"' << endl << '\"';
+ rOutStm.WriteChar( '\"' ) << endl;
+ rOutStm.WriteChar( '\"' );
rOutStm.WriteUniOrByteString( aEndName.GetHexName(), rOutStm.GetStreamCharSet() );
- rOutStm << '\"' << endl;
+ rOutStm.WriteChar( '\"' ) << endl;
SvMetaExtern::WriteSvIdl( rBase, rOutStm, nTab );
}
@@ -393,9 +394,9 @@ void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
if( !aHelpFileName.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
- rOutStm << "// class SvMetaModule" << endl;
+ rOutStm.WriteCharPtr( "// class SvMetaModule" ) << endl;
WriteTab( rOutStm, nTab );
- rOutStm << "helpfile(\"" << aHelpFileName.getString().getStr() << "\");" << endl;
+ rOutStm.WriteCharPtr( "helpfile(\"" ).WriteCharPtr( aHelpFileName.getString().getStr() ).WriteCharPtr( "\");" ) << endl;
}
}
@@ -410,16 +411,16 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
if( !aSlotIdFile.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
- rOutStm << "#include \"" << aSlotIdFile.getString().getStr() << '"' << endl << endl;
+ rOutStm.WriteCharPtr( "#include \"" ).WriteCharPtr( aSlotIdFile.getString().getStr() ).WriteChar( '"' ) << endl << endl;
}
SvMetaExtern::Write( rBase, rOutStm, nTab, nT, nA );
rOutStm << endl;
WriteTab( rOutStm, nTab );
- rOutStm << "library " << GetName().getString().getStr() << endl;
+ rOutStm.WriteCharPtr( "library " ).WriteCharPtr( GetName().getString().getStr() ) << endl;
WriteTab( rOutStm, nTab );
- rOutStm << '{' << endl;
+ rOutStm.WriteChar( '{' ) << endl;
WriteTab( rOutStm, nTab );
- rOutStm << "importlib(\"STDOLE.TLB\");" << endl;
+ rOutStm.WriteCharPtr( "importlib(\"STDOLE.TLB\");" ) << endl;
for( sal_uLong n = 0; n < aClassList.size(); n++ )
{
@@ -434,49 +435,50 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
- rOutStm << '}' << endl;
+ rOutStm.WriteChar( '}' ) << endl;
}
break;
case WRITE_DOCU:
{
- rOutStm << "SvIDL interface documentation" << endl << endl;
- rOutStm << "<MODULE>" << endl << GetName().getString().getStr() << endl;
+ rOutStm.WriteCharPtr( "SvIDL interface documentation" ) << endl << endl;
+ rOutStm.WriteCharPtr( "<MODULE>" ) << endl;
+ rOutStm.WriteCharPtr( GetName().getString().getStr() ) << endl;
WriteDescription( rOutStm );
- rOutStm << "</MODULE>" << endl << endl;
+ rOutStm.WriteCharPtr( "</MODULE>" ) << endl << endl;
- rOutStm << "<CLASSES>" << endl;
+ rOutStm.WriteCharPtr( "<CLASSES>" ) << endl;
for( sal_uLong n = 0; n < aClassList.size(); n++ )
{
SvMetaClass * pClass = aClassList[n];
if( !pClass->IsShell() )
{
- rOutStm << pClass->GetName().getString().getStr();
+ rOutStm.WriteCharPtr( pClass->GetName().getString().getStr() );
SvMetaClass* pSC = pClass->GetSuperClass();
if( pSC )
- rOutStm << " : " << pSC->GetName().getString().getStr();
+ rOutStm.WriteCharPtr( " : " ).WriteCharPtr( pSC->GetName().getString().getStr() );
// imported classes
const SvClassElementMemberList& rClassList = pClass->GetClassList();
if ( !rClassList.empty() )
{
- rOutStm << " ( ";
+ rOutStm.WriteCharPtr( " ( " );
for( sal_uLong m=0; m<rClassList.size(); ++m )
{
SvClassElement *pEle = rClassList[m];
SvMetaClass *pCl = pEle->GetClass();
- rOutStm << pCl->GetName().getString().getStr();
+ rOutStm.WriteCharPtr( pCl->GetName().getString().getStr() );
if ( m+1 == rClassList.size() )
- rOutStm << " )";
+ rOutStm.WriteCharPtr( " )" );
else
- rOutStm << " , ";
+ rOutStm.WriteCharPtr( " , " );
}
}
rOutStm << endl;
}
}
- rOutStm << "</CLASSES>" << endl << endl;
+ rOutStm.WriteCharPtr( "</CLASSES>" ) << endl << endl;
// no break!
}
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 81996677f701..a0c3b55fbcc5 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -62,8 +62,8 @@ void SvClassElement::Save( SvPersistStream & rStm )
if( xClass.Is() ) nMask |= 0x4;
// write data
- rStm << nMask;
- if( nMask & 0x01 ) rStm << aAutomation;
+ rStm.WriteUChar( nMask );
+ if( nMask & 0x01 ) rStm.WriteUChar( aAutomation );
if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix);
if( nMask & 0x04 ) WriteSvPersistBase( rStm, xClass );
}
@@ -116,12 +116,12 @@ void SvMetaClass::Save( SvPersistStream & rStm )
if( aAutomation.IsSet() ) nMask |= 0x10;
// write data
- rStm << nMask;
+ rStm.WriteUChar( nMask );
if( nMask & 0x01 ) WriteSvDeclPersistList( rStm, aAttrList );
if( nMask & 0x02 ) WriteSvPersistBase( rStm, aSuperClass );
if( nMask & 0x04 ) WriteSvDeclPersistList( rStm, aClassList );
if( nMask & 0x08 ) WriteSvPersistBase( rStm, xAutomationInterface );
- if( nMask & 0x10 ) rStm << aAutomation;
+ if( nMask & 0x10 ) rStm.WriteUChar( aAutomation );
}
void SvMetaClass::ReadAttributesSvIdl( SvIdlDataBase & rBase,
@@ -139,12 +139,12 @@ void SvMetaClass::WriteAttributesSvIdl( SvIdlDataBase & rBase,
if( !aAutomation )
{
WriteTab( rOutStm, nTab );
- rOutStm << "//class SvMetaClass" << endl;
+ rOutStm.WriteCharPtr( "//class SvMetaClass" ) << endl;
if( !aAutomation )
{
WriteTab( rOutStm, nTab );
aAutomation.WriteSvIdl( SvHash_Automation(), rOutStm );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
}
}
@@ -260,20 +260,20 @@ void SvMetaClass::WriteContextSvIdl
{
WriteTab( rOutStm, nTab );
aAttrList[n]->WriteSvIdl( rBase, rOutStm, nTab );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
for( n = 0; n < aClassList.size(); n++ )
{
SvClassElement * pEle = aClassList[n];
WriteTab( rOutStm, nTab );
- rOutStm << SvHash_import()->GetName().getStr() << ' '
- << pEle->GetPrefix().getStr();
+ rOutStm.WriteCharPtr( SvHash_import()->GetName().getStr() ).WriteChar( ' ' )
+ .WriteCharPtr( pEle->GetPrefix().getStr() );
if( pEle->GetAutomation() )
- rOutStm << " [ " << SvHash_Automation()->GetName().getStr()
- << " ]";
+ rOutStm.WriteCharPtr( " [ " ).WriteCharPtr( SvHash_Automation()->GetName().getStr() )
+ .WriteCharPtr( " ]" );
if( !pEle->GetPrefix().isEmpty() )
- rOutStm << ' ' << pEle->GetPrefix().getStr();
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ' ' ).WriteCharPtr( pEle->GetPrefix().getStr() );
+ rOutStm.WriteChar( ';' ) << endl;
}
}
@@ -370,7 +370,7 @@ void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
{
WriteHeaderSvIdl( rBase, rOutStm, nTab );
if( aSuperClass.Is() )
- rOutStm << " : " << aSuperClass->GetName().getString().getStr();
+ rOutStm.WriteCharPtr( " : " ).WriteCharPtr( aSuperClass->GetName().getString().getStr() );
rOutStm << endl;
SvMetaName::WriteSvIdl( rBase, rOutStm, nTab );
rOutStm << endl;
@@ -396,13 +396,13 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
case WRITE_DOCU:
{
- rOutStm << "<INTERFACE>" << endl
- << GetName().getString().getStr();
+ rOutStm.WriteCharPtr( "<INTERFACE>" ) << endl;
+ rOutStm.WriteCharPtr( GetName().getString().getStr() );
if ( GetAutomation() )
- rOutStm << " ( Automation ) ";
+ rOutStm.WriteCharPtr( " ( Automation ) " );
rOutStm << endl;
WriteDescription( rOutStm );
- rOutStm << "</INTERFACE>" << endl << endl;
+ rOutStm.WriteCharPtr( "</INTERFACE>" ) << endl << endl;
// write all attributes
sal_uLong n;
@@ -561,20 +561,20 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
{
WriteStars( rOutStm );
// define class
- rOutStm << "#ifdef " << GetName().getString().getStr() << endl;
- rOutStm << "#undef ShellClass" << endl;
- rOutStm << "#undef " << GetName().getString().getStr() << endl;
- rOutStm << "#define ShellClass " << GetName().getString().getStr() << endl;
+ rOutStm.WriteCharPtr( "#ifdef " ).WriteCharPtr( GetName().getString().getStr() ) << endl;
+ rOutStm.WriteCharPtr( "#undef ShellClass" ) << endl;
+ rOutStm.WriteCharPtr( "#undef " ).WriteCharPtr( GetName().getString().getStr() ) << endl;
+ rOutStm.WriteCharPtr( "#define ShellClass " ).WriteCharPtr( GetName().getString().getStr() ) << endl;
// no slotmaps get written for interfaces
if( !IsShell() )
{
- rOutStm << "#endif" << endl << endl;
+ rOutStm.WriteCharPtr( "#endif" ) << endl << endl;
return;
}
// write parameter array
- rOutStm << "SFX_ARGUMENTMAP(" << GetName().getString().getStr() << ')' << endl
- << '{' << endl;
+ rOutStm.WriteCharPtr( "SFX_ARGUMENTMAP(" ).WriteCharPtr( GetName().getString().getStr() ).WriteChar( ')' ) << endl;
+ rOutStm.WriteChar( '{' ) << endl;
std::vector<sal_uLong> aSuperList;
SvMetaClassList classList;
@@ -597,9 +597,10 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
{
// at leaast one dummy
WriteTab( rOutStm, 1 );
- rOutStm << "SFX_ARGUMENT( 0, 0, SfxVoidItem )" << endl;
+ rOutStm.WriteCharPtr( "SFX_ARGUMENT( 0, 0, SfxVoidItem )" ) << endl;
}
- rOutStm << endl << "};" << endl << endl;
+ rOutStm << endl;
+ rOutStm.WriteCharPtr( "};" ) << endl << endl;
ByteStringList aStringList;
WriteSlotStubs( GetName().getString(), aSlotList, aStringList, rOutStm );
@@ -610,8 +611,8 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
rOutStm << endl;
// write slotmap
- rOutStm << "SFX_SLOTMAP_ARG(" << GetName().getString().getStr() << ')' << endl
- << '{' << endl;
+ rOutStm.WriteCharPtr( "SFX_SLOTMAP_ARG(" ).WriteCharPtr( GetName().getString().getStr() ).WriteChar( ')' ) << endl;
+ rOutStm.WriteChar( '{' ) << endl;
// write all attributes
WriteSlots( GetName().getString(), 0, aSlotList, rBase, rOutStm );
@@ -621,13 +622,15 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
{
// at least one dummy
WriteTab( rOutStm, 1 );
- rOutStm << "SFX_SLOT_ARG(" << GetName().getString().getStr()
- << ", 0, 0, "
- << "SFX_STUB_PTR_EXEC_NONE,"
- << "SFX_STUB_PTR_STATE_NONE,"
- << "0, SfxVoidItem, 0, 0, \"\", 0 )" << endl;
+ rOutStm.WriteCharPtr( "SFX_SLOT_ARG(" ).WriteCharPtr( GetName().getString().getStr() )
+ .WriteCharPtr( ", 0, 0, " )
+ .WriteCharPtr( "SFX_STUB_PTR_EXEC_NONE," )
+ .WriteCharPtr( "SFX_STUB_PTR_STATE_NONE," )
+ .WriteCharPtr( "0, SfxVoidItem, 0, 0, \"\", 0 )" ) << endl;
}
- rOutStm << endl << "};" << endl << "#endif" << endl << endl;
+ rOutStm << endl;
+ rOutStm.WriteCharPtr( "};" ) << endl;
+ rOutStm.WriteCharPtr( "#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 1627aa801336..612bd60a116c 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -180,13 +180,13 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
if( aAsynchron.IsSet() ) nMask |= 0x8000;
// write data
- rStm << nMask;
+ rStm.WriteUInt16( nMask );
TEST_WRITE
if( nMask & 0x0001 ) WriteSvPersistBase( rStm, aMethod );
TEST_WRITE
if( nMask & 0x0002 ) WriteSvIdentifier( rStm, aGroupId );
TEST_WRITE
- if( nMask & 0x0004 ) rStm << aHasCoreId;
+ if( nMask & 0x0004 ) rStm.WriteUChar( aHasCoreId );
TEST_WRITE
if( nMask & 0x0008 ) WriteSvIdentifier( rStm, aConfigId );
TEST_WRITE
@@ -196,23 +196,23 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
TEST_WRITE
if( nMask & 0x0040 ) WriteSvIdentifier( rStm, aDefault );
TEST_WRITE
- if( nMask & 0x0080 ) rStm << aPseudoSlots;
+ if( nMask & 0x0080 ) rStm.WriteUChar( aPseudoSlots );
TEST_WRITE
- if( nMask & 0x0100 ) rStm << aGet;
+ if( nMask & 0x0100 ) rStm.WriteUChar( aGet );
TEST_WRITE
- if( nMask & 0x0200 ) rStm << aSet;
+ if( nMask & 0x0200 ) rStm.WriteUChar( aSet );
TEST_WRITE
- if( nMask & 0x0400 ) rStm << aCachable;
+ if( nMask & 0x0400 ) rStm.WriteUChar( aCachable );
TEST_WRITE
- if( nMask & 0x0800 ) rStm << aVolatile;
+ if( nMask & 0x0800 ) rStm.WriteUChar( aVolatile );
TEST_WRITE
- if( nMask & 0x1000 ) rStm << aToggle;
+ if( nMask & 0x1000 ) rStm.WriteUChar( aToggle );
TEST_WRITE
- if( nMask & 0x2000 ) rStm << aAutoUpdate;
+ if( nMask & 0x2000 ) rStm.WriteUChar( aAutoUpdate );
TEST_WRITE
- if( nMask & 0x4000 ) rStm << aSynchron;
+ if( nMask & 0x4000 ) rStm.WriteUChar( aSynchron );
TEST_WRITE
- if( nMask & 0x8000 ) rStm << aAsynchron;
+ if( nMask & 0x8000 ) rStm.WriteUChar( aAsynchron );
// write next bunch
// create mask
@@ -235,48 +235,48 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
if( aImageRotation.IsSet() ) nMask |= 0x8000;
// write data
- rStm << nMask;
+ rStm.WriteUInt16( nMask );
TEST_WRITE
- if( nMask & 0x0001 ) rStm << aRecordPerItem;
+ if( nMask & 0x0001 ) rStm.WriteUChar( aRecordPerItem );
TEST_WRITE
- if( nMask & 0x0002 ) rStm << aRecordManual;
+ if( nMask & 0x0002 ) rStm.WriteUChar( aRecordManual );
TEST_WRITE
- if( nMask & 0x0004 ) rStm << aNoRecord;
+ if( nMask & 0x0004 ) rStm.WriteUChar( aNoRecord );
TEST_WRITE
- if( nMask & 0x0008 ) rStm << aHasDialog;
+ if( nMask & 0x0008 ) rStm.WriteUChar( aHasDialog );
TEST_WRITE
if( nMask & 0x0010 ) WriteSvString( rStm, aDisableFlags );
TEST_WRITE
if( nMask & 0x0020 ) WriteSvIdentifier( rStm, aPseudoPrefix );
TEST_WRITE
- if( nMask & 0x0040 ) rStm << aRecordPerSet;
+ if( nMask & 0x0040 ) rStm.WriteUChar( aRecordPerSet );
TEST_WRITE
- if( nMask & 0x0080 ) rStm << aMenuConfig;
+ if( nMask & 0x0080 ) rStm.WriteUChar( aMenuConfig );
TEST_WRITE
- if( nMask & 0x0100 ) rStm << aToolBoxConfig;
+ if( nMask & 0x0100 ) rStm.WriteUChar( aToolBoxConfig );
TEST_WRITE
- if( nMask & 0x0200 ) rStm << aStatusBarConfig;
+ if( nMask & 0x0200 ) rStm.WriteUChar( aStatusBarConfig );
TEST_WRITE
- if( nMask & 0x0400 ) rStm << aAccelConfig;
+ if( nMask & 0x0400 ) rStm.WriteUChar( aAccelConfig );
TEST_WRITE
- if( nMask & 0x0800 ) rStm << aFastCall;
+ if( nMask & 0x0800 ) rStm.WriteUChar( aFastCall );
TEST_WRITE
- if( nMask & 0x1000 ) rStm << aContainer;
+ if( nMask & 0x1000 ) rStm.WriteUChar( aContainer );
TEST_WRITE
if( nMask & 0x2000 ) WriteSvPersistBase( rStm, aSlotType );
TEST_WRITE
- if( nMask & 0x4000 ) rStm << aRecordAbsolute;
+ if( nMask & 0x4000 ) rStm.WriteUChar( aRecordAbsolute );
TEST_WRITE
- if( nMask & 0x8000 ) rStm << aImageRotation;
+ if( nMask & 0x8000 ) rStm.WriteUChar( aImageRotation );
nMask = 0;
if( aUnoName.IsSet() ) nMask |= 0x0001;
if( aImageReflection.IsSet() ) nMask |= 0x0002;
- rStm << nMask;
+ rStm.WriteUInt16( nMask );
TEST_WRITE
if( nMask & 0x0001 ) WriteSvString( rStm, aUnoName );
TEST_WRITE
- if( nMask & 0x0002 ) rStm << aImageReflection;
+ if( nMask & 0x0002 ) rStm.WriteUChar( aImageReflection );
}
sal_Bool SvMetaSlot::IsVariable() const
@@ -629,45 +629,45 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
if( aSlotType.Is() )
{
WriteTab( rOutStm, nTab );
- rOutStm << SvHash_SlotType()->GetName().getStr() << '(';
+ rOutStm.WriteCharPtr( SvHash_SlotType()->GetName().getStr() ).WriteChar( '(' );
aSlotType->WriteTheType( rBase, rOutStm, nTab, WRITE_IDL );
- rOutStm << ");" << endl;
+ rOutStm.WriteCharPtr( ");" ) << endl;
}
if( aMethod.Is() )
{
WriteTab( rOutStm, nTab );
aMethod->WriteSvIdl( rBase, rOutStm, nTab );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( aHasCoreId )
{
aHasCoreId.WriteSvIdl( SvHash_HasCoreId(), rOutStm );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( !aGroupId.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
aGroupId.WriteSvIdl( SvHash_GroupId(), rOutStm, nTab +1);
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( !aExecMethod.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
aExecMethod.WriteSvIdl( SvHash_ExecMethod(), rOutStm, nTab +1);
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( !aStateMethod.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
aStateMethod.WriteSvIdl( SvHash_StateMethod(), rOutStm, nTab +1);
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( !aDisableFlags.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
aDisableFlags.WriteSvIdl( SvHash_DisableFlags(), rOutStm, nTab +1);
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( aSet || aGet || aPseudoSlots )
@@ -681,16 +681,16 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
}
if( aGet )
{
- rOutStm << p;
+ rOutStm.WriteCharPtr( p );
aGet.WriteSvIdl( SvHash_Get(), rOutStm );
p = ", ";
}
if( aSet )
{
- rOutStm << p;
+ rOutStm.WriteCharPtr( p );
aSet.WriteSvIdl( SvHash_Set(), rOutStm );
}
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
OString aDel(", ");
@@ -793,7 +793,7 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
if( !aOut.isEmpty() )
{
WriteTab( rOutStm, nTab );
- rOutStm << aOut.getStr() << endl;
+ rOutStm.WriteCharPtr( aOut.getStr() ) << endl;
}
}
@@ -1105,11 +1105,11 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
if ( !bIn )
{
rList.push_back( new OString(aMethodName) );
- rOutStm << "SFX_EXEC_STUB("
- << rShellName.getStr()
- << ','
- << aMethodName.getStr()
- << ')' << endl;
+ rOutStm.WriteCharPtr( "SFX_EXEC_STUB(" )
+ .WriteCharPtr( rShellName.getStr() )
+ .WriteChar( ',' )
+ .WriteCharPtr( aMethodName.getStr() )
+ .WriteChar( ')' ) << endl;
}
}
@@ -1130,11 +1130,11 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
if ( !bIn )
{
rList.push_back( new OString(aMethodName) );
- rOutStm << "SFX_STATE_STUB("
- << rShellName.getStr()
- << ','
- << aMethodName.getStr()
- << ')' << endl;
+ rOutStm.WriteCharPtr( "SFX_STATE_STUB(" )
+ .WriteCharPtr( rShellName.getStr() )
+ .WriteChar( ',' )
+ .WriteCharPtr( aMethodName.getStr() )
+ .WriteChar( ')' ) << endl;
}
}
}
@@ -1151,51 +1151,51 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
sal_Bool bIsEnumSlot = 0 != pEnumValue;
- rOutStm << "// Slot Nr. "
- << OString::number(nListPos).getStr()
- << " : ";
+ rOutStm.WriteCharPtr( "// Slot Nr. " )
+ .WriteCharPtr( OString::number(nListPos).getStr() )
+ .WriteCharPtr( " : " );
OString aSlotIdValue(OString::number(GetSlotId().GetValue()));
- rOutStm << aSlotIdValue.getStr() << endl;
+ rOutStm.WriteCharPtr( aSlotIdValue.getStr() ) << endl;
WriteTab( rOutStm, 1 );
if( bIsEnumSlot )
- rOutStm << "SFX_NEW_SLOT_ENUM( ";
+ rOutStm.WriteCharPtr( "SFX_NEW_SLOT_ENUM( " );
else
- rOutStm << "SFX_NEW_SLOT_ARG( " << rShellName.getStr() << ',' ;
+ rOutStm.WriteCharPtr( "SFX_NEW_SLOT_ARG( " ).WriteCharPtr( rShellName.getStr() ).WriteChar( ',' ) ;
- rOutStm << rSlotId.getStr() << ',';
+ rOutStm.WriteCharPtr( rSlotId.getStr() ).WriteChar( ',' );
const SvHelpContext& rHlpCtx = GetHelpContext();
if( rHlpCtx.IsSet() )
- rOutStm << rHlpCtx.getString().getStr() << ',';
+ rOutStm.WriteCharPtr( rHlpCtx.getString().getStr() ).WriteChar( ',' );
else
- rOutStm << rSlotId.getStr() << ',';
+ rOutStm.WriteCharPtr( rSlotId.getStr() ).WriteChar( ',' );
// GroupId
if( !GetGroupId().isEmpty() )
- rOutStm << GetGroupId().getStr();
+ rOutStm.WriteCharPtr( GetGroupId().getStr() );
else
- rOutStm << '0';
- rOutStm << ',' << endl;
+ rOutStm.WriteChar( '0' );
+ rOutStm.WriteChar( ',' ) << endl;
WriteTab( rOutStm, 4 );
if( bIsEnumSlot )
{
- rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << OString::number(pLinkedSlot->GetListPos()).getStr()
- << "] /*Offset Master*/, " << endl;
+ rOutStm.WriteCharPtr( "&a" ).WriteCharPtr( rShellName.getStr() ).WriteCharPtr( "Slots_Impl[" )
+ .WriteCharPtr( OString::number(pLinkedSlot->GetListPos()).getStr() )
+ .WriteCharPtr( "] /*Offset Master*/, " ) << endl;
WriteTab( rOutStm, 4 );
- rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << OString::number(pNextSlot->GetListPos()).getStr()
- << "] /*Offset Next*/, " << endl;
+ rOutStm.WriteCharPtr( "&a" ).WriteCharPtr( rShellName.getStr() ).WriteCharPtr( "Slots_Impl[" )
+ .WriteCharPtr( OString::number(pNextSlot->GetListPos()).getStr() )
+ .WriteCharPtr( "] /*Offset Next*/, " ) << endl;
WriteTab( rOutStm, 4 );
// SlotId
if( !GetSlotId().getString().isEmpty() )
- rOutStm << pLinkedSlot->GetSlotId().getString().getStr();
+ rOutStm.WriteCharPtr( pLinkedSlot->GetSlotId().getString().getStr() );
else
- rOutStm << '0';
- rOutStm << ',';
- rOutStm << pEnumValue->GetName().getString().getStr();
+ rOutStm.WriteChar( '0' );
+ rOutStm.WriteChar( ',' );
+ rOutStm.WriteCharPtr( pEnumValue->GetName().getString().getStr() );
}
else
{
@@ -1234,19 +1234,19 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
if ( !pLinkedSlot )
{
- rOutStm << "0 ,";
+ rOutStm.WriteCharPtr( "0 ," );
}
else
{
- rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << OString::number(pLinkedSlot->GetListPos()).getStr()
- << "] /*Offset Linked*/, " << endl;
+ rOutStm.WriteCharPtr( "&a" ).WriteCharPtr( rShellName.getStr() ).WriteCharPtr( "Slots_Impl[" )
+ .WriteCharPtr( OString::number(pLinkedSlot->GetListPos()).getStr() )
+ .WriteCharPtr( "] /*Offset Linked*/, " ) << endl;
WriteTab( rOutStm, 4 );
}
- rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << OString::number(pNextSlot->GetListPos()).getStr()
- << "] /*Offset Next*/, " << endl;
+ rOutStm.WriteCharPtr( "&a" ).WriteCharPtr( rShellName.getStr() ).WriteCharPtr( "Slots_Impl[" )
+ .WriteCharPtr( OString::number(pNextSlot->GetListPos()).getStr() )
+ .WriteCharPtr( "] /*Offset Next*/, " ) << endl;
WriteTab( rOutStm, 4 );
@@ -1254,84 +1254,84 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
if( !GetExecMethod().isEmpty() &&
GetExecMethod() != "NoExec")
{
- rOutStm << "SFX_STUB_PTR(" << rShellName.getStr() << ','
- << GetExecMethod().getStr() << ')';
+ rOutStm.WriteCharPtr( "SFX_STUB_PTR(" ).WriteCharPtr( rShellName.getStr() ).WriteChar( ',' )
+ .WriteCharPtr( GetExecMethod().getStr() ).WriteChar( ')' );
}
else
- rOutStm << "SFX_STUB_PTR_EXEC_NONE";
- rOutStm << ',';
+ rOutStm.WriteCharPtr( "SFX_STUB_PTR_EXEC_NONE" );
+ rOutStm.WriteChar( ',' );
// write StateMethod, with standard name if not specified
if( !GetStateMethod().isEmpty() &&
GetStateMethod() != "NoState")
{
- rOutStm << "SFX_STUB_PTR(" << rShellName.getStr() << ','
- << GetStateMethod().getStr() << ')';
+ rOutStm.WriteCharPtr( "SFX_STUB_PTR(" ).WriteCharPtr( rShellName.getStr() ).WriteChar( ',' )
+ .WriteCharPtr( GetStateMethod().getStr() ).WriteChar( ')' );
}
else
- rOutStm << "SFX_STUB_PTR_STATE_NONE";
+ rOutStm.WriteCharPtr( "SFX_STUB_PTR_STATE_NONE" );
}
- rOutStm << ',' << endl;
+ rOutStm.WriteChar( ',' ) << endl;
WriteTab( rOutStm, 4 );
// write flags
if( GetHasCoreId() )
- rOutStm << MakeSlotName( SvHash_HasCoreId() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_HasCoreId() ).getStr() ).WriteChar( '|' );
if( GetCachable() )
- rOutStm << MakeSlotName( SvHash_Cachable() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_Cachable() ).getStr() ).WriteChar( '|' );
if( GetVolatile() )
- rOutStm << MakeSlotName( SvHash_Volatile() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_Volatile() ).getStr() ).WriteChar( '|' );
if( GetToggle() )
- rOutStm << MakeSlotName( SvHash_Toggle() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_Toggle() ).getStr() ).WriteChar( '|' );
if( GetAutoUpdate() )
- rOutStm << MakeSlotName( SvHash_AutoUpdate() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_AutoUpdate() ).getStr() ).WriteChar( '|' );
if( GetSynchron() )
- rOutStm << MakeSlotName( SvHash_Synchron() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_Synchron() ).getStr() ).WriteChar( '|' );
if( GetAsynchron() )
- rOutStm << MakeSlotName( SvHash_Asynchron() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_Asynchron() ).getStr() ).WriteChar( '|' );
if( GetRecordPerItem() )
- rOutStm << MakeSlotName( SvHash_RecordPerItem() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_RecordPerItem() ).getStr() ).WriteChar( '|' );
if( GetRecordPerSet() )
- rOutStm << MakeSlotName( SvHash_RecordPerSet() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_RecordPerSet() ).getStr() ).WriteChar( '|' );
if( GetRecordManual() )
- rOutStm << MakeSlotName( SvHash_RecordManual() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_RecordManual() ).getStr() ).WriteChar( '|' );
if( GetNoRecord() )
- rOutStm << MakeSlotName( SvHash_NoRecord() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_NoRecord() ).getStr() ).WriteChar( '|' );
if( GetRecordAbsolute() )
- rOutStm << MakeSlotName( SvHash_RecordAbsolute() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_RecordAbsolute() ).getStr() ).WriteChar( '|' );
if( GetHasDialog() )
- rOutStm << MakeSlotName( SvHash_HasDialog() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_HasDialog() ).getStr() ).WriteChar( '|' );
if( GetMenuConfig() )
- rOutStm << MakeSlotName( SvHash_MenuConfig() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_MenuConfig() ).getStr() ).WriteChar( '|' );
if( GetToolBoxConfig() )
- rOutStm << MakeSlotName( SvHash_ToolBoxConfig() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_ToolBoxConfig() ).getStr() ).WriteChar( '|' );
if( GetStatusBarConfig() )
- rOutStm << MakeSlotName( SvHash_StatusBarConfig() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_StatusBarConfig() ).getStr() ).WriteChar( '|' );
if( GetAccelConfig() )
- rOutStm << MakeSlotName( SvHash_AccelConfig() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_AccelConfig() ).getStr() ).WriteChar( '|' );
if( GetFastCall() )
- rOutStm << MakeSlotName( SvHash_FastCall() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_FastCall() ).getStr() ).WriteChar( '|' );
if( GetContainer() )
- rOutStm << MakeSlotName( SvHash_Container() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_Container() ).getStr() ).WriteChar( '|' );
if ( GetReadOnlyDoc() )
- rOutStm << MakeSlotName( SvHash_ReadOnlyDoc() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_ReadOnlyDoc() ).getStr() ).WriteChar( '|' );
if( GetImageRotation() )
- rOutStm << MakeSlotName( SvHash_ImageRotation() ).getStr() << '|';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_ImageRotation() ).getStr() ).WriteChar( '|' );
if( GetImageReflection() )
- rOutStm << MakeSlotName( SvHash_ImageReflection() ).getStr() << '|';
- rOutStm << '0';
+ rOutStm.WriteCharPtr( MakeSlotName( SvHash_ImageReflection() ).getStr() ).WriteChar( '|' );
+ rOutStm.WriteChar( '0' );
- rOutStm << ',' << endl;
+ rOutStm.WriteChar( ',' ) << endl;
WriteTab( rOutStm, 4 );
if ( GetDisableFlags().isEmpty() )
- rOutStm << "0";
+ rOutStm.WriteCharPtr( "0" );
else
- rOutStm << GetDisableFlags().getStr();
+ rOutStm.WriteCharPtr( GetDisableFlags().getStr() );
// write attribute type
if( !bIsEnumSlot )
{
- rOutStm << ',' << endl;
+ rOutStm.WriteChar( ',' ) << endl;
WriteTab( rOutStm, 4 );
SvMetaType * pT = GetSlotType();
@@ -1344,12 +1344,12 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
}
if( pT )
{
- rOutStm << pT->GetName().getString().getStr();
+ rOutStm.WriteCharPtr( pT->GetName().getString().getStr() );
if( !rBase.FindType( pT, rBase.aUsedTypes ) )
rBase.aUsedTypes.push_back( pT );
}
else
- rOutStm << "SfxVoidItem not defined";
+ rOutStm.WriteCharPtr( "SfxVoidItem not defined" );
}
else
{
@@ -1360,11 +1360,11 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
if( !bIsEnumSlot )
{
- rOutStm << ',' << endl;
+ rOutStm.WriteChar( ',' ) << endl;
WriteTab( rOutStm, 4 );
rOutStm
- << OString::number(nCount).getStr()
- << "/*Offset*/, ";
+ .WriteCharPtr( OString::number(nCount).getStr() )
+ .WriteCharPtr( "/*Offset*/, " );
if( IsMethod() )
{
@@ -1376,47 +1376,47 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
pType = GetType();
sal_uLong nSCount = pType->GetAttrCount();
rOutStm
- << OString::number(nSCount).getStr()
- << "/*Count*/";
+ .WriteCharPtr( OString::number(nSCount).getStr() )
+ .WriteCharPtr( "/*Count*/" );
}
else
- rOutStm << '0';
+ rOutStm.WriteChar( '0' );
// name for recording
if ( GetExport() )
{
- rOutStm << ",\"";
+ rOutStm.WriteCharPtr( ",\"" );
if (!rPrefix.isEmpty())
- rOutStm << rPrefix.getStr();
- rOutStm << '.';
+ rOutStm.WriteCharPtr( rPrefix.getStr() );
+ rOutStm.WriteChar( '.' );
if ( !IsVariable() || !GetType() ||
GetType()->GetBaseType()->GetType() != TYPE_STRUCT )
- rOutStm << GetMangleName( sal_False ).getStr();
- rOutStm << "\",";
+ rOutStm.WriteCharPtr( GetMangleName( sal_False ).getStr() );
+ rOutStm.WriteCharPtr( "\"," );
}
else
- rOutStm << ", 0, ";
+ rOutStm.WriteCharPtr( ", 0, " );
// Method/Property flags
if( IsMethod() )
- rOutStm << "SFX_SLOT_METHOD|";
+ rOutStm.WriteCharPtr( "SFX_SLOT_METHOD|" );
if( IsVariable() )
{
- rOutStm << "SFX_SLOT_PROPGET|";
+ rOutStm.WriteCharPtr( "SFX_SLOT_PROPGET|" );
if( !GetReadonly() )
- rOutStm << "SFX_SLOT_PROPSET|";
+ rOutStm.WriteCharPtr( "SFX_SLOT_PROPSET|" );
}
- rOutStm << '0';
+ rOutStm.WriteChar( '0' );
}
{
- rOutStm << ",\"";
- rOutStm << GetMangleName( sal_False ).getStr();
- rOutStm << "\"";
+ rOutStm.WriteCharPtr( ",\"" );
+ rOutStm.WriteCharPtr( GetMangleName( sal_False ).getStr() );
+ rOutStm.WriteCharPtr( "\"" );
}
- rOutStm << " )," << endl;
+ rOutStm.WriteCharPtr( " )," ) << endl;
}
sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm )
@@ -1443,12 +1443,12 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO
SvMetaAttribute * pPar = rList[n];
SvMetaType * pPType = pPar->GetType();
WriteTab( rOutStm, 1 );
- rOutStm << "SFX_ARGUMENT("
- << pPar->GetSlotId().getString().getStr() << ',' // SlodId
+ rOutStm.WriteCharPtr( "SFX_ARGUMENT(" )
+ .WriteCharPtr( pPar->GetSlotId().getString().getStr() ).WriteChar( ',' ) // SlodId
// parameter name
- << "\"" << pPar->GetName().getString().getStr() << "\","
+ .WriteCharPtr( "\"" ).WriteCharPtr( pPar->GetName().getString().getStr() ).WriteCharPtr( "\"," )
// item name
- << pPType->GetName().getString().getStr() << ")," << endl;
+ .WriteCharPtr( pPType->GetName().getString().getStr() ).WriteCharPtr( ")," ) << endl;
if( !rBase.FindType( pPType, rBase.aUsedTypes ) )
rBase.aUsedTypes.push_back( pPType );
}
@@ -1491,8 +1491,8 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
if( rTable.find( nSId ) == rTable.end() )
{
rTable[ nSId ] = this;
- rOutStm << "#define " << GetSlotId().getString().getStr() << '\t'
- << OString::number(nSId).getStr()
+ rOutStm.WriteCharPtr( "#define " ).WriteCharPtr( GetSlotId().getString().getStr() ).WriteChar( '\t' )
+ .WriteCharPtr( OString::number(nSId).getStr() )
<< endl;
}
@@ -1526,9 +1526,9 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
{
rTable[ nSId2 ] = this;
- rOutStm << "#define " << aSId.getStr() << '\t'
- << OString::number(
- nSId2).getStr()
+ rOutStm.WriteCharPtr( "#define " ).WriteCharPtr( aSId.getStr() ).WriteChar( '\t' )
+ .WriteCharPtr( OString::number(
+ nSId2).getStr() )
<< endl;
}
}
@@ -1538,26 +1538,26 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
void WriteBool( sal_Bool bSet, SvStream& rStream )
{
if ( bSet )
- rStream << "TRUE" << ',';
+ rStream.WriteCharPtr( "TRUE" ).WriteChar( ',' );
else
- rStream << "FALSE" << ',';
+ rStream.WriteCharPtr( "FALSE" ).WriteChar( ',' );
}
void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
{
- rStrm << "PROJECT,";
- rStrm << GetSlotId().getString().getStr() << ',';
+ rStrm.WriteCharPtr( "PROJECT," );
+ rStrm.WriteCharPtr( GetSlotId().getString().getStr() ).WriteChar( ',' );
rStrm
- << OString::number(
- GetSlotId().GetValue()).getStr()
- << ',';
+ .WriteCharPtr( OString::number(
+ GetSlotId().GetValue()).getStr() )
+ .WriteChar( ',' );
if ( !GetPseudoPrefix().isEmpty() )
- rStrm << GetPseudoPrefix().getStr() << ',';
+ rStrm.WriteCharPtr( GetPseudoPrefix().getStr() ).WriteChar( ',' );
else
- rStrm << ',';
+ rStrm.WriteChar( ',' );
- rStrm << GetGroupId().getStr() << ',';
+ rStrm.WriteCharPtr( GetGroupId().getStr() ).WriteChar( ',' );
WriteBool( GetAccelConfig(), rStrm );
WriteBool( GetMenuConfig(), rStrm );
@@ -1565,15 +1565,15 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
WriteBool( GetToolBoxConfig(), rStrm );
if ( GetSlotType() )
- rStrm << GetSlotType()->GetName().getString().getStr() << ',';
+ rStrm.WriteCharPtr( GetSlotType()->GetName().getString().getStr() ).WriteChar( ',' );
else
- rStrm << ',';
+ rStrm.WriteChar( ',' );
WriteBool( GetAutoUpdate(), rStrm );
if ( GetCachable() )
- rStrm << "Cachable" << ',';
+ rStrm.WriteCharPtr( "Cachable" ).WriteChar( ',' );
else
- rStrm << "Volatile" << ',';
+ rStrm.WriteCharPtr( "Volatile" ).WriteChar( ',' );
WriteBool( GetContainer(), rStrm );
WriteBool( GetFastCall(), rStrm );
@@ -1582,39 +1582,39 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
WriteBool( GetReadOnlyDoc(), rStrm );
WriteBool( GetImageRotation(), rStrm );
WriteBool( GetImageReflection(), rStrm );
- rStrm << GetDisableFlags().getStr() << ',';
+ rStrm.WriteCharPtr( GetDisableFlags().getStr() ).WriteChar( ',' );
if( GetSynchron() )
- rStrm << "Synchron" << ',';
+ rStrm.WriteCharPtr( "Synchron" ).WriteChar( ',' );
else
- rStrm << "Asynchron" << ',';
+ rStrm.WriteCharPtr( "Asynchron" ).WriteChar( ',' );
WriteBool( GetToggle(), rStrm );
WriteBool( GetReadonly(), rStrm );
WriteBool( GetExport(), rStrm );
if( GetRecordPerItem() )
- rStrm << "RecordPerItem" << ',';
+ rStrm.WriteCharPtr( "RecordPerItem" ).WriteChar( ',' );
else if ( GetNoRecord() )
- rStrm << "NoRecord" << ',';
+ rStrm.WriteCharPtr( "NoRecord" ).WriteChar( ',' );
else if ( GetRecordManual() )
- rStrm << "RecordManual" << ',';
+ rStrm.WriteCharPtr( "RecordManual" ).WriteChar( ',' );
else
- rStrm << "RecordPerSet" << ',';
+ rStrm.WriteCharPtr( "RecordPerSet" ).WriteChar( ',' );
WriteBool( GetRecordAbsolute(), rStrm );
if ( GetType()->GetType() != TYPE_METHOD && GetMethod() )
{
- rStrm << GetMethod()->GetType()->GetReturnType()->GetName().getString().getStr() << ',';
- rStrm << GetMethod()->GetName().getString().getStr() << ',';
+ rStrm.WriteCharPtr( GetMethod()->GetType()->GetReturnType()->GetName().getString().getStr() ).WriteChar( ',' );
+ rStrm.WriteCharPtr( GetMethod()->GetName().getString().getStr() ).WriteChar( ',' );
}
else
{
- rStrm << ",,";
+ rStrm.WriteCharPtr( ",," );
}
- rStrm << GetType()->GetSvName().getStr() << ',';
- rStrm << GetName().getString().getStr() << ',';
+ rStrm.WriteCharPtr( GetType()->GetSvName().getStr() ).WriteChar( ',' );
+ rStrm.WriteCharPtr( GetName().getString().getStr() ).WriteChar( ',' );
if ( GetType()->GetType() == TYPE_METHOD || GetMethod() )
{
@@ -1624,7 +1624,7 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
if( pList && !pList->empty() )
{
- rStrm << "\"(";
+ rStrm.WriteCharPtr( "\"(" );
SvMetaAttributeMemberList::const_iterator it = pList->begin();
while( it != pList->end() )
{
@@ -1632,12 +1632,12 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
pAttr->WriteCSV( rBase, rStrm );
++it;
if( it != pList->end() )
- rStrm << ',';
+ rStrm.WriteChar( ',' );
}
- rStrm << ")\"";
+ rStrm.WriteCharPtr( ")\"" );
}
else
- rStrm << "()";
+ rStrm.WriteCharPtr( "()" );
}
rStrm << endl;
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index c9c93717134f..89ce61f6c32e 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -86,15 +86,15 @@ void SvMetaAttribute::Save( SvPersistStream & rStm )
if( aHidden.IsSet() ) nMask |= 0x80;
// write data
- rStm << nMask;
+ rStm.WriteUChar( nMask );
if( nMask & 0x1 ) WriteSvPersistBase( rStm, aType );
if( nMask & 0x2 ) WriteSvNumberIdentifier( rStm, aSlotId );
- if( nMask & 0x4 ) rStm << aExport;
- if( nMask & 0x8 ) rStm << aReadonly;
- if( nMask & 0x10 ) rStm << aAutomation;
- if( nMask & 0x20 ) rStm << aIsCollection;
- if( nMask & 0x40 ) rStm << aReadOnlyDoc;
- if( nMask & 0x80 ) rStm << aHidden;
+ if( nMask & 0x4 ) rStm.WriteUChar( aExport );
+ if( nMask & 0x8 ) rStm.WriteUChar( aReadonly );
+ if( nMask & 0x10 ) rStm.WriteUChar( aAutomation );
+ if( nMask & 0x20 ) rStm.WriteUChar( aIsCollection );
+ if( nMask & 0x40 ) rStm.WriteUChar( aReadOnlyDoc );
+ if( nMask & 0x80 ) rStm.WriteUChar( aHidden );
}
SvMetaType * SvMetaAttribute::GetType() const
@@ -240,9 +240,9 @@ void SvMetaAttribute::WriteSvIdl
{
SvMetaType * pType = GetType();
pType->WriteTypePrefix( rBase, rOutStm, nTab, WRITE_IDL );
- rOutStm << ' ' << GetName().getString().getStr();
+ rOutStm.WriteChar( ' ' ).WriteCharPtr( GetName().getString().getStr() );
if( aSlotId.IsSet() )
- rOutStm << ' ' << aSlotId.getString().getStr();
+ rOutStm.WriteChar( ' ' ).WriteCharPtr( aSlotId.getString().getStr() );
if( pType->GetType() == TYPE_METHOD )
pType->WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
sal_uLong nPos = rOutStm.Tell();
@@ -284,42 +284,42 @@ void SvMetaAttribute::WriteAttributesSvIdl
if( !aExport || !aAutomation || aReadonly )
{
WriteTab( rOutStm, nTab );
- rOutStm << "//class SvMetaAttribute" << endl;
+ rOutStm.WriteCharPtr( "//class SvMetaAttribute" ) << endl;
if( !aExport )
{
WriteTab( rOutStm, nTab );
aExport.WriteSvIdl( SvHash_Export(), rOutStm );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if ( aHidden != aExport )
{
WriteTab( rOutStm, nTab );
aExport.WriteSvIdl( SvHash_Hidden(), rOutStm );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( aReadonly )
{
WriteTab( rOutStm, nTab );
aReadonly.WriteSvIdl( SvHash_Readonly(), rOutStm );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( !aAutomation )
{
WriteTab( rOutStm, nTab );
aAutomation.WriteSvIdl( SvHash_Automation(), rOutStm );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( aIsCollection )
{
WriteTab( rOutStm, nTab );
aIsCollection.WriteSvIdl( SvHash_IsCollection(), rOutStm );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
if( !aReadOnlyDoc )
{
WriteTab( rOutStm, nTab );
aReadOnlyDoc.WriteSvIdl( SvHash_ReadOnlyDoc(), rOutStm );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
}
}
@@ -346,7 +346,7 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
rList[i]->WriteParam( rBase, rOutStm, nTab, nT );
if( i+1<nCount )
{
- rOutStm << ',';
+ rOutStm.WriteChar( ',' );
}
}
}
@@ -360,8 +360,8 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
if( !GetName().getString().isEmpty() )
{
- rOutStm << ' ';
- rOutStm << GetName().getString().getStr();
+ rOutStm.WriteChar( ' ' );
+ rOutStm.WriteCharPtr( GetName().getString().getStr() );
}
if ( nT == WRITE_DOCU )
@@ -373,7 +373,7 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
OSL_FAIL( "Falscher Parametertyp!" );
}
else
- rOutStm << pBaseType->GetBasicPostfix().getStr();
+ rOutStm.WriteCharPtr( pBaseType->GetBasicPostfix().getStr() );
}
}
}
@@ -414,18 +414,18 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm
bVar = sal_False;
WriteTab( rOutStm, nTab );
- rOutStm << "//class SvMetaAttribute" << endl;
+ rOutStm.WriteCharPtr( "//class SvMetaAttribute" ) << endl;
if( rId.IsSet() && !(nA & WA_STRUCT) )
{
WriteTab( rOutStm, nTab );
- rOutStm << "id("
- << OString::number(MakeSlotValue(rBase,bVar)).getStr()
- << ")," << endl;
+ rOutStm.WriteCharPtr( "id(" )
+ .WriteCharPtr( OString::number(MakeSlotValue(rBase,bVar)).getStr() )
+ .WriteCharPtr( ")," ) << endl;
}
if( bVar && (bReadonly || IsMethod()) )
{
WriteTab( rOutStm, nTab );
- rOutStm << "readonly," << endl;
+ rOutStm.WriteCharPtr( "readonly," ) << endl;
}
}
}
@@ -444,66 +444,66 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
bVoid = pBaseType->GetReturnType()->GetBaseType()->GetName().getString() == "void";
// emit methods/functions body
- rOutStm << '{' << endl;
+ rOutStm.WriteChar( '{' ) << endl;
WriteTab( rOutStm, 1 );
if( !bVoid )
{
if ( pBaseType->GetCName() == "double" )
{
- rOutStm << "return *(double*)";
+ rOutStm.WriteCharPtr( "return *(double*)" );
}
else
{
- rOutStm << "return (";
+ rOutStm.WriteCharPtr( "return (" );
pType->WriteTypePrefix( rBase, rOutStm, 2, WRITE_C_SOURCE );
- rOutStm << ") ";
+ rOutStm.WriteCharPtr( ") " );
}
}
- rOutStm << "pODKCallFunction( "
- << OString::number(MakeSlotValue(rBase, IsVariable())).getStr();
- rOutStm << ',' << endl;
+ rOutStm.WriteCharPtr( "pODKCallFunction( " )
+ .WriteCharPtr( OString::number(MakeSlotValue(rBase, IsVariable())).getStr() );
+ rOutStm.WriteChar( ',' ) << endl;
WriteTab( rOutStm, 3 );
- rOutStm << " h" << rBase.aIFaceName.getStr() << " , ";
+ rOutStm.WriteCharPtr( " h" ).WriteCharPtr( rBase.aIFaceName.getStr() ).WriteCharPtr( " , " );
OString aParserStr;
if( pBaseType->GetType() == TYPE_METHOD || bSet )
aParserStr = pBaseType->GetParserString();
if( !aParserStr.isEmpty() )
{
- rOutStm << '\"';
- rOutStm << aParserStr.getStr();
- rOutStm << "\", ";
+ rOutStm.WriteChar( '\"' );
+ rOutStm.WriteCharPtr( aParserStr.getStr() );
+ rOutStm.WriteCharPtr( "\", " );
}
else
- rOutStm << "NULL, ";
+ rOutStm.WriteCharPtr( "NULL, " );
if( pBaseType->GetType() == TYPE_METHOD && !bVoid )
{
- rOutStm << "'";
- rOutStm << pBaseType->GetReturnType()->GetBaseType()->GetParserChar();
- rOutStm << "'";
+ rOutStm.WriteCharPtr( "'" );
+ rOutStm.WriteChar( pBaseType->GetReturnType()->GetBaseType()->GetParserChar() );
+ rOutStm.WriteCharPtr( "'" );
}
else if ( !bSet )
{
- rOutStm << "'";
- rOutStm << pBaseType->GetParserChar();
- rOutStm << "'";
+ rOutStm.WriteCharPtr( "'" );
+ rOutStm.WriteChar( pBaseType->GetParserChar() );
+ rOutStm.WriteCharPtr( "'" );
}
else
- rOutStm << '0';
+ rOutStm.WriteChar( '0' );
if( !aParserStr.isEmpty() )
{
- rOutStm << ", ";
+ rOutStm.WriteCharPtr( ", " );
if( IsMethod() )
pBaseType->WriteParamNames( rBase, rOutStm, OString() );
else if( bSet )
pBaseType->WriteParamNames( rBase, rOutStm, GetName().getString() );
}
- rOutStm << " );" << endl;
- rOutStm << '}' << endl;
+ rOutStm.WriteCharPtr( " );" ) << endl;
+ rOutStm.WriteChar( '}' ) << endl;
}
void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
@@ -528,7 +528,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
pAttr->SetDescription( GetDescription().getString() );
pAttr->Write( rBase, rOutStm, nTab, nT, nA );
if( nT == WRITE_ODL && i +1 < nCount )
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
rBase.aStructSlotId = slotId;
@@ -575,8 +575,8 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
if( !GetName().getString().isEmpty() )
{
- rOutStm << ' ';
- rOutStm << GetName().getString().getStr();
+ rOutStm.WriteChar( ' ' );
+ rOutStm.WriteCharPtr( GetName().getString().getStr() );
}
if( pType->GetType() == TYPE_METHOD )
pType->WriteMethodArgs( rBase, rOutStm, nTab, nT );
@@ -591,10 +591,10 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
const char * pName = name.getStr();
WriteTab( rOutStm, nTab );
pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
- rOutStm << ' ' << pName;
+ rOutStm.WriteChar( ' ' ).WriteCharPtr( pName );
pType->WriteMethodArgs( rBase, rOutStm, nTab, nT );
if( nT == WRITE_C_HEADER )
- rOutStm << ';' << endl << endl;
+ rOutStm.WriteChar( ';' ) << endl << endl;
else
WriteCSource( rBase, rOutStm, sal_False );
}
@@ -603,7 +603,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
if( nBType == TYPE_STRUCT )
{
// for assistance emit the name of the property as acomment
- rOutStm << "/* " << GetName().getString().getStr() << " */" << endl;
+ rOutStm.WriteCharPtr( "/* " ).WriteCharPtr( GetName().getString().getStr() ).WriteCharPtr( " */" ) << endl;
WriteRecursiv_Impl( rBase, rOutStm, nTab, nT, nA );
}
@@ -616,15 +616,15 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
// allocation
WriteTab( rOutStm, nTab );
- rOutStm << "void ";
- rOutStm << rBase.aIFaceName.getStr()
- << "Set" << name.getStr() << "( " << C_PREF
- << "Object h" << rBase.aIFaceName.getStr() << ", " << endl;
+ rOutStm.WriteCharPtr( "void " );
+ rOutStm.WriteCharPtr( rBase.aIFaceName.getStr() )
+ .WriteCharPtr( "Set" ).WriteCharPtr( name.getStr() ).WriteCharPtr( "( " ).WriteCharPtr( C_PREF )
+ .WriteCharPtr( "Object h" ).WriteCharPtr( rBase.aIFaceName.getStr() ).WriteCharPtr( ", " ) << endl;
WriteTab( rOutStm, nTab+1 );
pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
- rOutStm << ' ' << name.getStr() << " )";
+ rOutStm.WriteChar( ' ' ).WriteCharPtr( name.getStr() ).WriteCharPtr( " )" );
if( nT == WRITE_C_HEADER )
- rOutStm << ';' << endl << endl;
+ rOutStm.WriteChar( ';' ) << endl << endl;
else
WriteCSource( rBase, rOutStm, sal_True );
}
@@ -632,12 +632,12 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
// access
WriteTab( rOutStm, nTab );
pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
- rOutStm << ' ';
- rOutStm << rBase.aIFaceName.getStr()
- << "Get" << name.getStr() << "( " << C_PREF
- << "Object h" << rBase.aIFaceName.getStr() << " )";
+ rOutStm.WriteChar( ' ' );
+ rOutStm.WriteCharPtr( rBase.aIFaceName.getStr() )
+ .WriteCharPtr( "Get" ).WriteCharPtr( name.getStr() ).WriteCharPtr( "( " ).WriteCharPtr( C_PREF )
+ .WriteCharPtr( "Object h" ).WriteCharPtr( rBase.aIFaceName.getStr() ).WriteCharPtr( " )" );
if( nT == WRITE_C_HEADER )
- rOutStm << ';' << endl << endl;
+ rOutStm.WriteChar( ';' ) << endl << endl;
else
WriteCSource( rBase, rOutStm, sal_False );
}
@@ -647,21 +647,21 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
if( !bVariable && IsMethod() )
{
- rOutStm << "<METHOD>" << endl
- << GetSlotId().getString().getStr() << endl
- << GetName().getString().getStr() << endl
+ rOutStm.WriteCharPtr( "<METHOD>" ) << endl;
+ rOutStm.WriteCharPtr( GetSlotId().getString().getStr() ) << endl;
+ rOutStm.WriteCharPtr( GetName().getString().getStr() ) << endl
<< endl; // readonly
// return type
SvMetaType* pType2 = GetType();
SvMetaType* pBaseType2 = pType2->GetBaseType();
- rOutStm << pBaseType2->GetReturnType()->GetBaseType()->GetBasicName().getStr() << endl;
+ rOutStm.WriteCharPtr( pBaseType2->GetReturnType()->GetBaseType()->GetBasicName().getStr() ) << endl;
DBG_ASSERT( !pBaseType2->GetReturnType()->GetBaseType()->GetBasicName().isEmpty(),
"Leerer BasicName" );
// syntax
- rOutStm << GetName().getString().getStr();
+ rOutStm.WriteCharPtr( GetName().getString().getStr() );
pType2->WriteMethodArgs( rBase, rOutStm, nTab, nT );
// C return type
@@ -669,13 +669,13 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
rOutStm << endl;
// for methods also C syntax
- rOutStm << "<C-SYNTAX>" << endl;
+ rOutStm.WriteCharPtr( "<C-SYNTAX>" ) << endl;
Write( rBase, rOutStm, 0, WRITE_C_HEADER, nA );
- rOutStm << "</C-SYNTAX>" << endl;
+ rOutStm.WriteCharPtr( "</C-SYNTAX>" ) << endl;
// description
WriteDescription( rOutStm );
- rOutStm << "</METHOD>" << endl << endl;
+ rOutStm.WriteCharPtr( "</METHOD>" ) << endl << endl;
}
else if( bVariable && IsVariable() )
{
@@ -685,16 +685,16 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
else
{
- rOutStm << "<PROPERTY>" << endl
- << GetSlotId().getString().getStr() << endl
- << GetName().getString().getStr() << endl;
+ rOutStm.WriteCharPtr( "<PROPERTY>" ) << endl;
+ rOutStm.WriteCharPtr( GetSlotId().getString().getStr() ) << endl;
+ rOutStm.WriteCharPtr( GetName().getString().getStr() ) << endl;
if ( GetReadonly() )
- rOutStm << "(nur lesen)" << endl;
+ rOutStm.WriteCharPtr( "(nur lesen)" ) << endl;
else
rOutStm << endl;
// for properties type instead of the return value
- rOutStm << pBaseType->GetBasicName().getStr() << endl;
+ rOutStm.WriteCharPtr( pBaseType->GetBasicName().getStr() ) << endl;
DBG_ASSERT( !pBaseType->GetBasicName().isEmpty(),
"Leerer BasicName" );
@@ -708,7 +708,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
// description
WriteDescription( rOutStm );
- rOutStm << "</PROPERTY>" << endl << endl;
+ rOutStm.WriteCharPtr( "</PROPERTY>" ) << endl << endl;
}
}
}
@@ -837,7 +837,7 @@ void SvMetaType::Save( SvPersistStream & rStm )
if( aBasicPostfix.IsSet() ) nMask |= 0x8000;
// write data
- rStm << nMask;
+ rStm.WriteUInt16( nMask );
if( nMask & 0x0001 ) WriteSvBOOL( rStm, aIn );
if( nMask & 0x0002 ) WriteSvBOOL( rStm, aOut );
if( nMask & 0x0004 ) WriteSvint( rStm, aCall0 );
@@ -847,8 +847,8 @@ void SvMetaType::Save( SvPersistStream & rStm )
if( nMask & 0x0040 ) WriteSvIdentifier( rStm, aSbxName );
if( nMask & 0x0080 ) WriteSvIdentifier( rStm, aOdlName );
if( nMask & 0x0100 ) WriteSvDeclPersistList( rStm, *pAttrList );
- if( nMask & 0x0800 ) rStm << (sal_uInt16)nType;
- if( nMask & 0x1000 ) rStm << cParserChar;
+ if( nMask & 0x0800 ) rStm.WriteUInt16( (sal_uInt16)nType );
+ if( nMask & 0x1000 ) rStm.WriteChar( cParserChar );
if( nMask & 0x2000 ) WriteSvIdentifier( rStm, aCName );
if( nMask & 0x4000 ) WriteSvIdentifier( rStm, aBasicName );
if( nMask & 0x8000 ) WriteSvIdentifier( rStm, aBasicPostfix );
@@ -1127,7 +1127,7 @@ void SvMetaType::WriteSvIdl
if( TestAndSeekSpaceOnly( rOutStm, nOldPos ) )
// nothin written
rOutStm.Seek( nOldPos );
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
}
void SvMetaType::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -1142,9 +1142,9 @@ void SvMetaType::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaAttribute * pAttr = *it;
pAttr->Write( rBase, rOutStm, nTab, nT, nA );
if( GetType() == TYPE_METHOD )
- rOutStm << ',' << endl;
+ rOutStm.WriteChar( ',' ) << endl;
else
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
++it;
}
}
@@ -1180,39 +1180,39 @@ void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
if ( nT == WRITE_C_HEADER )
{
OString aStr = name.toAsciiUpperCase();
- rOutStm << "#ifndef " << C_PREF << aStr.getStr() << "_DEF " << endl;
- rOutStm << "#define " << C_PREF << aStr.getStr() << "_DEF " << endl;
+ rOutStm.WriteCharPtr( "#ifndef " ).WriteCharPtr( C_PREF ).WriteCharPtr( aStr.getStr() ).WriteCharPtr( "_DEF " ) << endl;
+ rOutStm.WriteCharPtr( "#define " ).WriteCharPtr( C_PREF ).WriteCharPtr( aStr.getStr() ).WriteCharPtr( "_DEF " ) << endl;
}
WriteTab( rOutStm, nTab );
- rOutStm << "typedef" << endl;
+ rOutStm.WriteCharPtr( "typedef" ) << endl;
if ( nT == WRITE_ODL )
SvMetaName::Write( rBase, rOutStm, nTab, nT, nA );
}
WriteTab( rOutStm, nTab );
if( nType == TYPE_STRUCT )
- rOutStm << "struct";
+ rOutStm.WriteCharPtr( "struct" );
else if( nType == TYPE_UNION )
- rOutStm << "union";
+ rOutStm.WriteCharPtr( "union" );
else
- rOutStm << "enum";
+ rOutStm.WriteCharPtr( "enum" );
if( nT != WRITE_ODL && nT != WRITE_C_HEADER)
- rOutStm << ' ' << name.getStr();
+ rOutStm.WriteChar( ' ' ).WriteCharPtr( name.getStr() );
rOutStm << endl;
WriteTab( rOutStm, nTab );
- rOutStm << '{' << endl;
+ rOutStm.WriteChar( '{' ) << endl;
WriteContext( rBase, rOutStm, nTab +1, nT, nA );
WriteTab( rOutStm, nTab );
- rOutStm << '}';
+ rOutStm.WriteChar( '}' );
if( nT == WRITE_ODL || nT == WRITE_C_HEADER )
{
- rOutStm << ' ' << C_PREF << name.getStr();
+ rOutStm.WriteChar( ' ' ).WriteCharPtr( C_PREF ).WriteCharPtr( name.getStr() );
}
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
if ( nT == WRITE_C_HEADER )
- rOutStm << "#endif";
+ rOutStm.WriteCharPtr( "#endif" );
rOutStm << endl;
}
break;
@@ -1246,52 +1246,52 @@ void SvMetaType::WriteHeaderSvIdl( SvIdlDataBase & rBase,
case TYPE_CLASS:
{
if( IsShell() )
- rOutStm << SvHash_shell()->GetName().getStr();
+ rOutStm.WriteCharPtr( SvHash_shell()->GetName().getStr() );
else
- rOutStm << SvHash_interface()->GetName().getStr();
- rOutStm << ' ' << GetName().getString().getStr();
+ rOutStm.WriteCharPtr( SvHash_interface()->GetName().getStr() );
+ rOutStm.WriteChar( ' ' ).WriteCharPtr( GetName().getString().getStr() );
}
break;
case TYPE_STRUCT:
{
- rOutStm << SvHash_struct()->GetName().getStr()
- << ' ' << GetName().getString().getStr();
+ rOutStm.WriteCharPtr( SvHash_struct()->GetName().getStr() )
+ .WriteChar( ' ' ).WriteCharPtr( GetName().getString().getStr() );
}
break;
case TYPE_UNION:
{
- rOutStm << SvHash_union()->GetName().getStr()
- << ' ' << GetName().getString().getStr();
+ rOutStm.WriteCharPtr( SvHash_union()->GetName().getStr() )
+ .WriteChar( ' ' ).WriteCharPtr( GetName().getString().getStr() );
}
break;
case TYPE_ENUM:
{
- rOutStm << SvHash_enum()->GetName().getStr()
- << ' ' << GetName().getString().getStr();
+ rOutStm.WriteCharPtr( SvHash_enum()->GetName().getStr() )
+ .WriteChar( ' ' ).WriteCharPtr( GetName().getString().getStr() );
}
break;
case TYPE_POINTER:
case TYPE_BASE:
{
if( IsItem() )
- rOutStm << SvHash_item()->GetName().getStr() << ' ';
+ rOutStm.WriteCharPtr( SvHash_item()->GetName().getStr() ).WriteChar( ' ' );
else
- rOutStm << SvHash_typedef()->GetName().getStr() << ' ';
+ rOutStm.WriteCharPtr( SvHash_typedef()->GetName().getStr() ).WriteChar( ' ' );
if( GetRef() )
{
((SvMetaType *)GetRef())->WriteTheType( rBase, rOutStm, nTab, WRITE_IDL );
- rOutStm << ' ';
+ rOutStm.WriteChar( ' ' );
}
- rOutStm << GetName().getString().getStr();
+ rOutStm.WriteCharPtr( GetName().getString().getStr() );
}
break;
case TYPE_METHOD:
{
- rOutStm << SvHash_typedef()->GetName().getStr() << ' ';
+ rOutStm.WriteCharPtr( SvHash_typedef()->GetName().getStr() ).WriteChar( ' ' );
((SvMetaType *)GetRef())->WriteTheType( rBase, rOutStm, nTab, WRITE_IDL );
- rOutStm << ' ' << GetName().getString().getStr() << "( ";
+ rOutStm.WriteChar( ' ' ).WriteCharPtr( GetName().getString().getStr() ).WriteCharPtr( "( " );
WriteContextSvIdl( rBase, rOutStm, nTab );
- rOutStm << " )";
+ rOutStm.WriteCharPtr( " )" );
}
break;
}
@@ -1315,7 +1315,7 @@ void SvMetaType::WriteAttributesSvIdl( SvIdlDataBase & rBase,
if( aSvName.getString() != name || aSbxName.getString() != name || aOdlName.getString() != name )
{
WriteTab( rOutStm, nTab );
- rOutStm << "class SvMetaType" << endl;
+ rOutStm.WriteCharPtr( "class SvMetaType" ) << endl;
if( aSvName.getString() != name )
{
WriteTab( rOutStm, nTab );
@@ -1364,9 +1364,9 @@ void SvMetaType::WriteContextSvIdl
WriteTab( rOutStm, nTab );
pAttr->WriteSvIdl( rBase, rOutStm, nTab );
if( GetType() == TYPE_METHOD )
- rOutStm << ',' << endl;
+ rOutStm.WriteChar( ',' ) << endl;
else
- rOutStm << ';' << endl;
+ rOutStm.WriteChar( ';' ) << endl;
++it;
}
}
@@ -1411,28 +1411,29 @@ void SvMetaType::WriteSfxItem(
OString::number(nAttrCount));
aTypeName.append(aAttrCount);
- rOutStm << "extern " << aTypeName.getStr()
- << aVarName.getStr() << ';' << endl;
+ rOutStm.WriteCharPtr( "extern " ).WriteCharPtr( aTypeName.getStr() )
+ .WriteCharPtr( aVarName.getStr() ).WriteChar( ';' ) << endl;
// write the implementation part
- rOutStm << "#ifdef SFX_TYPEMAP" << endl
- << "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS))) || defined(LIBO_MERGELIBS))" << endl
- << "__attribute__((__weak__))" << endl
- << "#endif" << endl
- << aTypeName.getStr() << aVarName.getStr()
- << " = " << endl;
- rOutStm << '{' << endl
- << "\tTYPE(" << rItemName.getStr() << "), "
- << aAttrCount.getStr();
+ rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl;
+ rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS))) || defined(LIBO_MERGELIBS))" ) << endl;
+ rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl;
+ rOutStm.WriteCharPtr( "#endif" ) << endl;
+ rOutStm.WriteCharPtr( aTypeName.getStr() ).WriteCharPtr( aVarName.getStr() )
+ .WriteCharPtr( " = " ) << endl;
+ rOutStm.WriteChar( '{' ) << endl;
+ rOutStm.WriteCharPtr( "\tTYPE(" ).WriteCharPtr( rItemName.getStr() ).WriteCharPtr( "), " )
+ .WriteCharPtr( aAttrCount.getStr() );
if( nAttrCount )
{
- rOutStm << ", { ";
+ rOutStm.WriteCharPtr( ", { " );
// write the single attributes
- rOutStm << aAttrArray.getStr();
- rOutStm << " }";
+ rOutStm.WriteCharPtr( aAttrArray.getStr() );
+ rOutStm.WriteCharPtr( " }" );
}
- rOutStm << endl << "};" << endl
- << "#endif" << endl << endl;
+ rOutStm << endl;
+ rOutStm.WriteCharPtr( "};" ) << endl;
+ rOutStm.WriteCharPtr( "#endif" ) << endl << endl;
}
void SvMetaType::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
@@ -1476,7 +1477,7 @@ void SvMetaType::WriteMethodArgs
{
rOutStm << endl;
WriteTab( rOutStm, nTab );
- rOutStm << '(' << endl;
+ rOutStm.WriteChar( '(' ) << endl;
SvMetaAttributeMemberList::const_iterator it = pAttrList->begin();
while( it != pAttrList->end() )
@@ -1486,19 +1487,19 @@ void SvMetaType::WriteMethodArgs
pAttr->WriteSvIdl( rBase, rOutStm, nTab +1 );
++it;
if( it != pAttrList->end() )
- rOutStm << ',' << endl;
+ rOutStm.WriteChar( ',' ) << endl;
}
rOutStm << endl;
WriteTab( rOutStm, nTab );
- rOutStm << ')';
+ rOutStm.WriteChar( ')' );
}
else
- rOutStm << "()";
+ rOutStm.WriteCharPtr( "()" );
}
else if ( nT == WRITE_DOCU )
{
- rOutStm << '(';
+ rOutStm.WriteChar( '(' );
if( GetAttrCount() )
{
SvMetaAttributeMemberList::const_iterator it = pAttrList->begin();
@@ -1508,23 +1509,23 @@ void SvMetaType::WriteMethodArgs
pAttr->WriteParam( rBase, rOutStm, nTab+1, nT );
++it;
if( it != pAttrList->end() )
- rOutStm << ',';
+ rOutStm.WriteChar( ',' );
else
- rOutStm << ' ';
+ rOutStm.WriteChar( ' ' );
}
}
- rOutStm << ')' << endl;
+ rOutStm.WriteChar( ')' ) << endl;
}
else
{
- rOutStm << '(';
+ rOutStm.WriteChar( '(' );
if( nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE )
{
- rOutStm << ' ' << C_PREF << "Object h" << rBase.aIFaceName.getStr();
+ rOutStm.WriteChar( ' ' ).WriteCharPtr( C_PREF ).WriteCharPtr( "Object h" ).WriteCharPtr( rBase.aIFaceName.getStr() );
if( GetAttrCount() )
- rOutStm << ',';
+ rOutStm.WriteChar( ',' );
else
- rOutStm << ' ';
+ rOutStm.WriteChar( ' ' );
}
if( GetAttrCount() )
@@ -1551,16 +1552,16 @@ void SvMetaType::WriteMethodArgs
}
++it;
if( it != pAttrList->end() )
- rOutStm << ',' << endl;
+ rOutStm.WriteChar( ',' ) << endl;
}
if( nT != WRITE_C_HEADER && nT != WRITE_C_SOURCE )
{
rOutStm << endl;
WriteTab( rOutStm, nTab +1 );
}
- rOutStm << ' ';
+ rOutStm.WriteChar( ' ' );
}
- rOutStm << ')';
+ rOutStm.WriteChar( ')' );
}
}
@@ -1572,12 +1573,12 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
case WRITE_IDL:
{
if( GetIn() && GetOut() )
- rOutStm << SvHash_inout()->GetName().getStr() << ' ';
+ rOutStm.WriteCharPtr( SvHash_inout()->GetName().getStr() ).WriteChar( ' ' );
else if( GetIn() )
- rOutStm << SvHash_in()->GetName().getStr() << ' ';
+ rOutStm.WriteCharPtr( SvHash_in()->GetName().getStr() ).WriteChar( ' ' );
else if( GetOut() )
- rOutStm << SvHash_out()->GetName().getStr() << ' ';
- rOutStm << GetCString().getStr();
+ rOutStm.WriteCharPtr( SvHash_out()->GetName().getStr() ).WriteChar( ' ' );
+ rOutStm.WriteCharPtr( GetCString().getStr() );
}
break;
@@ -1588,11 +1589,11 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
if( bIn || bOut )
{
if( bIn && bOut )
- rOutStm << "[in,out] ";
+ rOutStm.WriteCharPtr( "[in,out] " );
else if( bIn )
- rOutStm << "[in] ";
+ rOutStm.WriteCharPtr( "[in] " );
else if( bOut )
- rOutStm << "[out] ";
+ rOutStm.WriteCharPtr( "[out] " );
}
OString out;
@@ -1605,11 +1606,11 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
}
if( aCall0 == (int)CALL_POINTER
|| aCall0 == (int)CALL_REFERENCE )
- rOutStm << " *";
+ rOutStm.WriteCharPtr( " *" );
if( aCall1 == (int)CALL_POINTER
|| aCall1 == (int)CALL_REFERENCE )
- rOutStm << " *";
- rOutStm << out.getStr();
+ rOutStm.WriteCharPtr( " *" );
+ rOutStm.WriteCharPtr( out.getStr() );
}
break;
@@ -1628,21 +1629,21 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
else if( nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE )
{
if( TYPE_STRUCT == pBaseType->GetType() )
- rOutStm << C_PREF << pBaseType->GetName().getString().getStr()
- << " *";
+ rOutStm.WriteCharPtr( C_PREF ).WriteCharPtr( pBaseType->GetName().getString().getStr() )
+ .WriteCharPtr( " *" );
else
{
if ( pBaseType->GetType() == TYPE_ENUM )
- rOutStm << C_PREF;
- rOutStm << pBaseType->GetCName().getStr();
+ rOutStm.WriteCharPtr( C_PREF );
+ rOutStm.WriteCharPtr( pBaseType->GetCName().getStr() );
}
}
else
{
if( TYPE_STRUCT == pBaseType->GetType() )
- rOutStm << pBaseType->GetName().getString().getStr() << " *";
+ rOutStm.WriteCharPtr( pBaseType->GetName().getString().getStr() ).WriteCharPtr( " *" );
else
- rOutStm << pBaseType->GetName().getString().getStr();
+ rOutStm.WriteCharPtr( pBaseType->GetName().getString().getStr() );
}
}
break;
@@ -1661,11 +1662,11 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
else
{
if( TYPE_STRUCT == pBaseType->GetType() )
- rOutStm << "VARIANT" << pBaseType->GetName().getString().getStr();
+ rOutStm.WriteCharPtr( "VARIANT" ).WriteCharPtr( pBaseType->GetName().getString().getStr() );
else if ( pBaseType->GetType() == TYPE_ENUM )
- rOutStm << "integer";
+ rOutStm.WriteCharPtr( "integer" );
else
- rOutStm << pBaseType->GetOdlName().getStr();
+ rOutStm.WriteCharPtr( pBaseType->GetOdlName().getStr() );
}
}
@@ -1729,11 +1730,11 @@ void SvMetaType::WriteParamNames( SvIdlDataBase & rBase,
OString aStr = pA->GetName().getString();
pA->GetType()->WriteParamNames( rBase, rOutStm, aStr );
if( n +1 < nAttrCount )
- rOutStm << ", ";
+ rOutStm.WriteCharPtr( ", " );
}
}
else
- rOutStm << rChief.getStr();
+ rOutStm.WriteCharPtr( rChief.getStr() );
}
}
@@ -1782,7 +1783,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
if( !aEnumValue.isEmpty() ) nMask |= 0x01;
// write data
- rStm << nMask;
+ rStm.WriteUChar( nMask );
if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aEnumValue);
}
@@ -1796,16 +1797,16 @@ sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
void SvMetaEnumValue::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
{
- rOutStm << GetName().getString().getStr();
+ rOutStm.WriteCharPtr( GetName().getString().getStr() );
}
void SvMetaEnumValue::Write( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16,
WriteType nT, WriteAttribute )
{
if ( nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE )
- rOutStm << C_PREF << GetName().getString().getStr();
+ rOutStm.WriteCharPtr( C_PREF ).WriteCharPtr( GetName().getString().getStr() );
else
- rOutStm << GetName().getString().getStr();
+ rOutStm.WriteCharPtr( GetName().getString().getStr() );
}
SV_IMPL_META_FACTORY1( SvMetaTypeEnum, SvMetaType );
@@ -1840,7 +1841,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
if( !aPrefix.isEmpty() ) nMask |= 0x02;
// write data
- rStm << nMask;
+ rStm.WriteUChar( nMask );
if( nMask & 0x01 ) WriteSvDeclPersistList( rStm, aEnumValueList );
if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix);
}
@@ -1894,7 +1895,7 @@ void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase,
{
aEnumValueList[n]->WriteSvIdl( rBase, rOutStm, nTab );
if( n + 1 != aEnumValueList.size() )
- rOutStm << ", ";
+ rOutStm.WriteCharPtr( ", " );
else
rOutStm << endl;
}
@@ -1943,11 +1944,11 @@ void SvMetaTypeEnum::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
{
if( 2 == n % 3 )
{
- rOutStm << ',' << endl;
+ rOutStm.WriteChar( ',' ) << endl;
WriteTab( rOutStm, nTab +1 );
}
else
- rOutStm << ",\t";
+ rOutStm.WriteCharPtr( ",\t" );
}
else
rOutStm << endl;
@@ -2036,9 +2037,9 @@ OString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
void SvMetaAttribute::WriteCSV( SvIdlDataBase&, SvStream& rStrm )
{
- rStrm << GetType()->GetSvName().getStr() << ' ';
- rStrm << GetName().getString().getStr() << ' ';
- rStrm << GetSlotId().getString().getStr();
+ rStrm.WriteCharPtr( GetType()->GetSvName().getStr() ).WriteChar( ' ' );
+ rStrm.WriteCharPtr( GetName().getString().getStr() ).WriteChar( ' ' );
+ rStrm.WriteCharPtr( GetSlotId().getString().getStr() );
}
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 1439ce7a1fb4..c1152e6d94b7 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -128,8 +128,8 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
SvPersistStream aPStm( *IDLAPP->pClassMgr, &rStm );
aPStm.SetContextFlags( nFlags );
- aPStm << (sal_uInt32)DATABASE_SIGNATURE;
- aPStm << (sal_uInt16)DATABASE_VER;
+ aPStm.WriteUInt32( (sal_uInt32)DATABASE_SIGNATURE );
+ aPStm.WriteUInt16( (sal_uInt16)DATABASE_VER );
sal_Bool bOnlyStreamedObjs = sal_False;
if( nFlags & IDL_WRITE_CALLING )
@@ -152,7 +152,7 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
aTypeList.WriteObjects( aPStm, bOnlyStreamedObjs );
aAttrList.WriteObjects( aPStm, bOnlyStreamedObjs );
aModuleList.WriteObjects( aPStm, bOnlyStreamedObjs );
- aPStm << nUniqueId;
+ aPStm.WriteUInt32( nUniqueId );
}
void SvIdlDataBase::SetError( const OString& rError, SvToken * pTok )
@@ -709,9 +709,9 @@ sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
for ( size_t i = 0, n = aList.size(); i < n; ++i )
{
SvStringHashEntry* pEntry = aList[ i ];
- rOutStm << "#define " << pEntry->GetName().getStr()
- << '\t'
- << OString::number(pEntry->GetValue()).getStr()
+ rOutStm.WriteCharPtr( "#define " ).WriteCharPtr( pEntry->GetName().getStr() )
+ .WriteChar( '\t' )
+ .WriteCharPtr( OString::number(pEntry->GetValue()).getStr() )
<< endl;
}
}
@@ -746,7 +746,7 @@ sal_Bool SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
pType->WriteSfx( *this, rOutStm );
}
aUsedTypes.clear();
- rOutStm << aTmpStm;
+ rOutStm.WriteStream( aTmpStm );
return sal_True;
}
@@ -833,8 +833,8 @@ struct WriteDep
explicit WriteDep(SvFileStream & rStream) : m_rStream(rStream) { }
void operator() (OUString const& rItem)
{
- m_rStream << " \\\n ";
- m_rStream << OUStringToOString(rItem, RTL_TEXTENCODING_UTF8).getStr();
+ m_rStream.WriteCharPtr( " \\\n " );
+ m_rStream.WriteCharPtr( OUStringToOString(rItem, RTL_TEXTENCODING_UTF8).getStr() );
}
};
@@ -846,18 +846,18 @@ struct WriteDummy
explicit WriteDummy(SvFileStream & rStream) : m_rStream(rStream) { }
void operator() (OUString const& rItem)
{
- m_rStream << OUStringToOString(rItem, RTL_TEXTENCODING_UTF8).getStr();
- m_rStream << " :\n\n";
+ m_rStream.WriteCharPtr( OUStringToOString(rItem, RTL_TEXTENCODING_UTF8).getStr() );
+ m_rStream.WriteCharPtr( " :\n\n" );
}
};
bool SvIdlDataBase::WriteDepFile(
SvFileStream & rStream, OUString const& rTarget)
{
- rStream << OUStringToOString(rTarget, RTL_TEXTENCODING_UTF8).getStr();
- rStream << " :";
+ rStream.WriteCharPtr( OUStringToOString(rTarget, RTL_TEXTENCODING_UTF8).getStr() );
+ rStream.WriteCharPtr( " :" );
::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDep(rStream));
- rStream << "\n\n";
+ rStream.WriteCharPtr( "\n\n" );
::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDummy(rStream));
return rStream.GetError() == SVSTREAM_OK;
}
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 2ad9bef43254..77c6295d93d1 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -205,7 +205,7 @@ XclExpStream& XclExpStream::operator<<( double fValue )
if (mbUseEncrypter && HasValidEncrypter())
mxEncrypter->Encrypt(mrStrm, fValue);
else
- mrStrm << fValue;
+ mrStrm.WriteDouble( fValue );
return *this;
}
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index a6450cdabec2..999b8a3d9e76 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -317,8 +317,8 @@ Size ScHTMLExport::MMToPixel( const Size& rSize )
sal_uLong ScHTMLExport::Write()
{
- rStrm << '<' << OOO_STRING_SVTOOLS_HTML_doctype << ' ' << OOO_STRING_SVTOOLS_HTML_doctype40 << '>'
- << SAL_NEWLINE_STRING << SAL_NEWLINE_STRING;
+ rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype40 ).WriteChar( '>' )
+ .WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( SAL_NEWLINE_STRING );
TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html );
WriteHeader();
OUT_LF();
@@ -365,19 +365,19 @@ void ScHTMLExport::WriteHeader()
// CSS1 StyleSheet
PageDefaults( bAll ? 0 : aRange.aStart.Tab() );
IncIndent(1);
- rStrm << "<" << OOO_STRING_SVTOOLS_HTML_style << " " << OOO_STRING_SVTOOLS_HTML_O_type << "=\"text/css\">";
+ rStrm.WriteCharPtr( "<" ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_style ).WriteCharPtr( " " ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_type ).WriteCharPtr( "=\"text/css\">" );
- rStrm << sMyBegComment; OUT_LF();
- rStrm << OOO_STRING_SVTOOLS_HTML_body << "," << OOO_STRING_SVTOOLS_HTML_division << "," << OOO_STRING_SVTOOLS_HTML_table << ","
- << OOO_STRING_SVTOOLS_HTML_thead << "," << OOO_STRING_SVTOOLS_HTML_tbody << "," << OOO_STRING_SVTOOLS_HTML_tfoot << ","
- << OOO_STRING_SVTOOLS_HTML_tablerow << "," << OOO_STRING_SVTOOLS_HTML_tableheader << ","
- << OOO_STRING_SVTOOLS_HTML_tabledata << "," << OOO_STRING_SVTOOLS_HTML_parabreak << " { " << sFontFamily;
+ rStrm.WriteCharPtr( sMyBegComment ); OUT_LF();
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body ).WriteCharPtr( "," ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_division ).WriteCharPtr( "," ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_table ).WriteCharPtr( "," )
+ .WriteCharPtr( OOO_STRING_SVTOOLS_HTML_thead ).WriteCharPtr( "," ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tbody ).WriteCharPtr( "," ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tfoot ).WriteCharPtr( "," )
+ .WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tablerow ).WriteCharPtr( "," ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tableheader ).WriteCharPtr( "," )
+ .WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tabledata ).WriteCharPtr( "," ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_parabreak ).WriteCharPtr( " { " ).WriteCharPtr( sFontFamily );
sal_Int32 nFonts = comphelper::string::getTokenCount(aHTMLStyle.aFontFamilyName, ';');
if ( nFonts == 1 )
{
- rStrm << '\"';
+ rStrm.WriteChar( '\"' );
OUT_STR( aHTMLStyle.aFontFamilyName );
- rStrm << '\"';
+ rStrm.WriteChar( '\"' );
}
else
{ // Fontlist, VCL: Semicolon as separator
@@ -385,17 +385,17 @@ void ScHTMLExport::WriteHeader()
const OUString& rList = aHTMLStyle.aFontFamilyName;
for ( sal_Int32 j = 0, nPos = 0; j < (sal_Int32) nFonts; j++ )
{
- rStrm << '\"';
+ rStrm.WriteChar( '\"' );
OUT_STR( rList.getToken( 0, ';', nPos ) );
- rStrm << '\"';
+ rStrm.WriteChar( '\"' );
if ( j < nFonts-1 )
- rStrm << ", ";
+ rStrm.WriteCharPtr( ", " );
}
}
- rStrm << "; " << sFontSize
- << GetFontSizeCss( ( sal_uInt16 ) aHTMLStyle.nFontHeight ) << " }";
+ rStrm.WriteCharPtr( "; " ).WriteCharPtr( sFontSize )
+ .WriteCharPtr( GetFontSizeCss( ( sal_uInt16 ) aHTMLStyle.nFontHeight ) ).WriteCharPtr( " }" );
OUT_LF();
- rStrm << sMyEndComment;
+ rStrm.WriteCharPtr( sMyEndComment );
IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_style );
IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head );
@@ -421,11 +421,11 @@ void ScHTMLExport::WriteOverview()
if ( !IsEmptyTable( nTab ) )
{
pDoc->GetName( nTab, aStr );
- rStrm << "<A HREF=\"#table"
- << OString::number(nTab).getStr()
- << "\">";
+ rStrm.WriteCharPtr( "<A HREF=\"#table" )
+ .WriteCharPtr( OString::number(nTab).getStr() )
+ .WriteCharPtr( "\">" );
OUT_STR( aStr );
- rStrm << "</A>";
+ rStrm.WriteCharPtr( "</A>" );
TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_linebreak );
}
}
@@ -559,7 +559,7 @@ void ScHTMLExport::WriteBody()
const SvxBrushItem* pBrushItem = (const SvxBrushItem*)&rSet.Get( ATTR_BACKGROUND );
// default text color black
- rStrm << '<' << OOO_STRING_SVTOOLS_HTML_body << ' ' << OOO_STRING_SVTOOLS_HTML_O_text << "=\"#000000\"";
+ rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_text ).WriteCharPtr( "=\"#000000\"" );
if ( bAll && GPOS_NONE != pBrushItem->GetGraphicPos() )
{
@@ -604,10 +604,10 @@ void ScHTMLExport::WriteBody()
}
if( !aLink.isEmpty() )
{
- rStrm << ' ' << OOO_STRING_SVTOOLS_HTML_O_background << "=\"";
+ rStrm.WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_background ).WriteCharPtr( "=\"" );
OUT_STR( URIHelper::simpleNormalizedMakeRelative(
aBaseURL,
- aLink ) ) << '\"';
+ aLink ) ).WriteChar( '\"' );
}
}
if ( !aHTMLStyle.aBackgroundColor.GetTransparency() )
@@ -619,7 +619,7 @@ void ScHTMLExport::WriteBody()
HTMLOutFuncs::Out_Color( rStrm, aHTMLStyle.aBackgroundColor );
}
- rStrm << '>'; OUT_LF();
+ rStrm.WriteChar( '>' ); OUT_LF();
if ( bAll )
WriteOverview();
@@ -679,9 +679,9 @@ void ScHTMLExport::WriteTables()
OUT_HR();
// Write anchor
- rStrm << "<A NAME=\"table"
- << OString::number(nTab).getStr()
- << "\">";
+ rStrm.WriteCharPtr( "<A NAME=\"table" )
+ .WriteCharPtr( OString::number(nTab).getStr() )
+ .WriteCharPtr( "\">" );
TAG_ON( OOO_STRING_SVTOOLS_HTML_head1 );
OUT_STR( aStrOut );
TAG_ON( OOO_STRING_SVTOOLS_HTML_emphasis );
@@ -691,7 +691,7 @@ void ScHTMLExport::WriteTables()
TAG_OFF( OOO_STRING_SVTOOLS_HTML_emphasis );
TAG_OFF( OOO_STRING_SVTOOLS_HTML_head1 );
- rStrm << "</A>"; OUT_LF();
+ rStrm.WriteCharPtr( "</A>" ); OUT_LF();
}
}
else
@@ -1216,11 +1216,11 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData )
bUrl = sal_True;
const SvxURLField* pURLField = (const SvxURLField*)pField;
// String aFieldText = rEngine.GetText( aSel );
- rStrm << '<' << OOO_STRING_SVTOOLS_HTML_anchor << ' ' << OOO_STRING_SVTOOLS_HTML_O_href << "=\"";
+ rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_anchor ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_href ).WriteCharPtr( "=\"" );
OUT_STR( pURLField->GetURL() );
- rStrm << "\">";
+ rStrm.WriteCharPtr( "\">" );
OUT_STR( pURLField->GetRepresentation() );
- rStrm << "</" << OOO_STRING_SVTOOLS_HTML_anchor << '>';
+ rStrm.WriteCharPtr( "</" ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_anchor ).WriteChar( '>' );
}
}
}
@@ -1273,7 +1273,7 @@ sal_Bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
{
INetURLObject aCpyURL( aDest );
SvFileStream aCpy( aCpyURL.PathToFileName(), STREAM_WRITE );
- aCpy << aTmp;
+ aCpy.WriteStream( aTmp );
aCpy.Close();
bRet = SVSTREAM_OK == aCpy.GetError();
@@ -1284,7 +1284,7 @@ sal_Bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
{
SvFileStream aCpy( aMedium.GetPhysicalName(), STREAM_WRITE );
- aCpy << aTmp;
+ aCpy.WriteStream( aTmp );
}
// Take over
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index ad2e6b7a0901..896d417a34d1 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -227,13 +227,13 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf,
// <IMG SRC="..."[ rImgOptions]>
if( !rLinkName.isEmpty() )
{
- rStrm << '<' << OOO_STRING_SVTOOLS_HTML_image << ' ' << OOO_STRING_SVTOOLS_HTML_O_src << "=\"";
+ rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_image ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_src ).WriteCharPtr( "=\"" );
HTMLOutFuncs::Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(
aBaseURL,
- rLinkName ), eDestEnc ) << '\"';
+ rLinkName ), eDestEnc ).WriteChar( '\"' );
if ( !rImgOptions.isEmpty() )
- rStrm << rImgOptions.getStr();
- rStrm << '>' << SAL_NEWLINE_STRING << GetIndentStr();
+ rStrm.WriteCharPtr( rImgOptions.getStr() );
+ rStrm.WriteChar( '>' ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() );
}
}
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index f5f5d8f64c8b..209531436621 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -66,25 +66,25 @@ ScRTFExport::~ScRTFExport()
sal_uLong ScRTFExport::Write()
{
- rStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
- rStrm << OOO_STRING_SVTOOLS_RTF_ANSI << SAL_NEWLINE_STRING;
+ rStrm.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF );
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING );
// Data
for ( SCTAB nTab = aRange.aStart.Tab(); nTab <= aRange.aEnd.Tab(); nTab++ )
{
if ( nTab > aRange.aStart.Tab() )
- rStrm << OOO_STRING_SVTOOLS_RTF_PAR;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAR );
WriteTab( nTab );
}
- rStrm << '}' << SAL_NEWLINE_STRING;
+ rStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
return rStrm.GetError();
}
void ScRTFExport::WriteTab( SCTAB nTab )
{
- rStrm << '{' << SAL_NEWLINE_STRING;
+ rStrm.WriteChar( '{' ).WriteCharPtr( SAL_NEWLINE_STRING );
if ( pDoc->HasTable( nTab ) )
{
memset( &pCellX[0], 0, (MAXCOL+2) * sizeof(sal_uLong) );
@@ -101,14 +101,14 @@ void ScRTFExport::WriteTab( SCTAB nTab )
WriteRow( nTab, nRow );
}
}
- rStrm << '}' << SAL_NEWLINE_STRING;
+ rStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
}
void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
{
- rStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30";
- rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::number(pDoc->GetRowHeight(nRow, nTab)).getStr();
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH ).WriteCharPtr( "30" ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRLEFT ).WriteCharPtr( "-30" );
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRRH ).WriteCharPtr( OString::number(pDoc->GetRowHeight(nRow, nTab)).getStr() );
SCCOL nCol;
SCCOL nEndCol = aRange.aEnd.Col();
for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
@@ -120,12 +120,12 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
const sal_Char* pChar;
if ( rMergeAttr.GetColMerge() != 0 )
- rStrm << OOO_STRING_SVTOOLS_RTF_CLMGF;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CLMGF );
else
{
const ScMergeFlagAttr& rMergeFlagAttr = (const ScMergeFlagAttr&) pAttr->GetItem( ATTR_MERGE_FLAG );
if ( rMergeFlagAttr.IsHorOverlapped() )
- rStrm << OOO_STRING_SVTOOLS_RTF_CLMRG;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CLMRG );
}
switch( rVerJustifyItem.GetValue() )
@@ -137,13 +137,13 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
default: pChar = NULL; break;
}
if ( pChar )
- rStrm << pChar;
+ rStrm.WriteCharPtr( pChar );
- rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::number(pCellX[nCol+1]).getStr();
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteCharPtr( OString::number(pCellX[nCol+1]).getStr() );
if ( (nCol & 0x0F) == 0x0F )
- rStrm << SAL_NEWLINE_STRING; // Do not let lines get too long
+ rStrm.WriteCharPtr( SAL_NEWLINE_STRING ); // Do not let lines get too long
}
- rStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL ).WriteCharPtr( SAL_NEWLINE_STRING );
sal_uLong nStrmPos = rStrm.Tell();
for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
@@ -151,11 +151,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 << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
nStrmPos = rStrm.Tell();
}
}
- rStrm << OOO_STRING_SVTOOLS_RTF_ROW << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW ).WriteCharPtr( SAL_NEWLINE_STRING );
}
@@ -166,7 +166,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
const ScMergeFlagAttr& rMergeFlagAttr = (const ScMergeFlagAttr&) pAttr->GetItem( ATTR_MERGE_FLAG );
if ( rMergeFlagAttr.IsHorOverlapped() )
{
- rStrm << OOO_STRING_SVTOOLS_RTF_CELL;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL );
return ;
}
@@ -221,32 +221,32 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
case SVX_HOR_JUSTIFY_REPEAT:
default: pChar = OOO_STRING_SVTOOLS_RTF_QL; break;
}
- rStrm << pChar;
+ rStrm.WriteCharPtr( pChar );
if ( rWeightItem.GetWeight() >= WEIGHT_BOLD )
{ // bold
bResetAttr = sal_True;
- rStrm << OOO_STRING_SVTOOLS_RTF_B;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B );
}
if ( rPostureItem.GetPosture() != ITALIC_NONE )
{ // italic
bResetAttr = sal_True;
- rStrm << OOO_STRING_SVTOOLS_RTF_I;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I );
}
if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE )
{ // underline
bResetAttr = sal_True;
- rStrm << OOO_STRING_SVTOOLS_RTF_UL;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL );
}
- rStrm << ' ';
+ rStrm.WriteChar( ' ' );
RTFOutFuncs::Out_String( rStrm, aContent );
- rStrm << OOO_STRING_SVTOOLS_RTF_CELL;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL );
if ( bResetPar )
- rStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL );
if ( bResetAttr )
- rStrm << OOO_STRING_SVTOOLS_RTF_PLAIN;
+ rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index c1da078cf804..efaa081bb26b 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -593,7 +593,7 @@ sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUse
if( pSrcStm )
{
rxOStm->SetBufferSize( 0xff00 );
- *rxOStm << *pSrcStm;
+ rxOStm->WriteStream( *pSrcStm );
delete pSrcStm;
}
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 5306c954c3db..db0df041e14c 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -466,7 +466,7 @@ sal_Bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObj
if( pSrcStm )
{
rxOStm->SetBufferSize( 0xff00 );
- *rxOStm << *pSrcStm;
+ rxOStm->WriteStream( *pSrcStm );
delete pSrcStm;
}
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 24d850c0aa11..b108c8643ac9 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -622,7 +622,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
if( pSrcStm )
{
rxOStm->SetBufferSize( 0xff00 );
- *rxOStm << *pSrcStm;
+ rxOStm->WriteStream( *pSrcStm );
delete pSrcStm;
}
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 787e8175cca8..7b2b73f99a34 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -61,21 +61,21 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
rtl_TextEncoding eDestEnc,
OUString *pNonConvertableChars )
{
- rStrm << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
if( pIndent )
- rStrm << pIndent;
+ rStrm.WriteCharPtr( pIndent );
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta).append(' ')
.append(bHTTPEquiv ? OOO_STRING_SVTOOLS_HTML_O_httpequiv : OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rStrm, rName, eDestEnc, pNonConvertableChars );
sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content).append("=\"");
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars ) << "\">";
+ HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars ).WriteCharPtr( "\">" );
}
void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
@@ -96,9 +96,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
}
// Titel (auch wenn er leer ist)
- rStrm << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
if( pIndent )
- rStrm << pIndent;
+ rStrm.WriteCharPtr( pIndent );
HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title );
if( i_xDocProps.is() )
{
@@ -114,16 +114,16 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
const OUString& rTarget = i_xDocProps->getDefaultTarget();
if( !rTarget.isEmpty() )
{
- rStrm << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
if( pIndent )
- rStrm << pIndent;
+ rStrm.WriteCharPtr( pIndent );
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_base).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_target).append("=\"");
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rStrm, rTarget, eDestEnc, pNonConvertableChars )
- << "\">";
+ .WriteCharPtr( "\">" );
}
}
@@ -256,7 +256,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
rBaseURL, aURL );
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src)
.append("=\"");
- rOut << sOut.makeStringAndClear().getStr();
+ rOut.WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rOut, aURL, eDestEnc, pNonConvertableChars );
sOut.append('\"');
}
@@ -267,7 +267,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
.append("=\"");
- rOut << sOut.makeStringAndClear().getStr();
+ rOut.WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rOut, aStr, eDestEnc, pNonConvertableChars );
sOut.append('\"');
}
@@ -311,7 +311,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
.append('=').append(pStr);
}
}
- rOut << sOut.getStr();
+ rOut.WriteCharPtr( sOut.getStr() );
}
catch (const uno::Exception&)
{
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index 8205f1751f84..8fcc660e7618 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -78,7 +78,7 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
pStrm = new SvMemoryStream( ( nEnd - nStt < 0x10000l
? nEnd - nStt + 32
: 0 ));
- *pStrm << rStream;
+ pStrm->WriteStream( rStream );
pStrm->SetStreamSize( nEnd - nStt + 1L );
pStrm->Seek( STREAM_SEEK_TO_BEGIN );
return pStrm;
@@ -91,7 +91,7 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
{
rStream.Seek(nFragStart);
pStrm = new SvMemoryStream(nSize);
- *pStrm << rStream;
+ pStrm->WriteStream( rStream );
pStrm->SetStreamSize(nSize);
pStrm->Seek(STREAM_SEEK_TO_BEGIN);
return pStrm;
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index c0c05b0ee106..9ad03eb34e04 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -244,7 +244,7 @@ sal_Bool SfxHTMLParser::FinishFileDownload( OUString& rStr )
SvMemoryStream aStream;
if( pStream )
- aStream << *pStream;
+ aStream.WriteStream( *pStream );
aStream.Seek( STREAM_SEEK_TO_END );
sal_Size nLen = aStream.Tell();
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index b95293dd7c05..1c6745ebbfa0 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -470,7 +470,7 @@ void SfxOleDoubleProperty::ImplLoad( SvStream& rStrm )
void SfxOleDoubleProperty::ImplSave( SvStream& rStrm )
{
- rStrm << mfValue;
+ rStrm.WriteDouble( mfValue );
}
// ----------------------------------------------------------------------------
@@ -640,7 +640,7 @@ void SfxOleDateProperty::ImplSave( SvStream& rStrm )
//number of days (not seconds) since December 31, 1899
long nStartDays = ::Date::DateToDays(31, 12, 1899);
double fValue = nDays-nStartDays;
- rStrm << fValue;
+ rStrm.WriteDouble( fValue );
}
// ----------------------------------------------------------------------------
diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index a38a3466a282..bec5a6fcc144 100644
--- a/svl/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.cxx
@@ -43,15 +43,15 @@
static void lclWriteMiniHeader(SvStream *p, sal_uInt32 nPreTag, sal_uInt32 nStartPos, sal_uInt32 nEndPos)
{
- (*p) << ( sal_uInt32(nPreTag) |
- sal_uInt32(nEndPos-nStartPos-SFX_REC_HEADERSIZE_MINI) << 8 );
+ (*p).WriteUInt32( sal_uInt32(nPreTag) |
+ sal_uInt32(nEndPos-nStartPos-SFX_REC_HEADERSIZE_MINI) << 8 );
}
static void lclWriteHeader(SvStream *p, sal_uInt32 nRecType, sal_uInt32 nContentTag, sal_uInt32 nContentVer)
{
- (*p) << ( sal_uInt32(nRecType) |
+ (*p).WriteUInt32( sal_uInt32(nRecType) |
( sal_uInt32(nContentVer) << 8 ) |
- ( sal_uInt32(nContentTag) << 16 ) );
+ ( sal_uInt32(nContentTag) << 16 ) );
}
#define SFX_REC_CONTENT_HEADER(nContentVer,n1StStartPos,nCurStartPos) \
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 731394df8a42..585e6bb08eea 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -115,13 +115,13 @@ SfxPoolItem* CntWallpaperItem::Create( SvStream& rStream, sal_uInt16 nVersion) c
// -----------------------------------------------------------------------
SvStream& CntWallpaperItem::Store( SvStream& rStream, sal_uInt16 ) const
{
- rStream << CNTWALLPAPERITEM_STREAM_MAGIC;
+ rStream.WriteUInt32( CNTWALLPAPERITEM_STREAM_MAGIC );
writeUnicodeString(rStream, _aURL);
// !!! Color stream operators do not work - they discard any
// transparency info !!!
// ??? Why the hell Color::Write(...) isn't const ???
(const_cast< CntWallpaperItem* >(this))->_nColor.Write( rStream, sal_True );
- rStream << _nStyle;
+ rStream.WriteUInt16( _nStyle );
return rStream;
}
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index 48509dbf9fb7..061f45913006 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -88,7 +88,7 @@ SvStream & CntContentTypeItem::Store(SvStream & rStream, sal_uInt16) const
// CntContentTypeItem used to be derived from CntStringItem, so take that
// into account:
writeUnicodeString(rStream, GetValue());
- rStream << CNTSTRINGITEM_STREAM_MAGIC << sal_Bool(sal_False);
+ rStream.WriteUInt32( CNTSTRINGITEM_STREAM_MAGIC ).WriteUChar( sal_Bool(sal_False) );
return rStream;
}
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index f63327b66558..0eb0add9ae54 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -117,15 +117,15 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
pImp->bStreaming = sal_True;
if ( !pStoreMaster )
{
- rStream << ( rStream.GetVersion() >= SOFFICE_FILEFORMAT_50
+ rStream.WriteUInt16( rStream.GetVersion() >= SOFFICE_FILEFORMAT_50
? SFX_ITEMPOOL_TAG_STARTPOOL_5
- : SFX_ITEMPOOL_TAG_STARTPOOL_4 );
- rStream << SFX_ITEMPOOL_VER_MAJOR << SFX_ITEMPOOL_VER_MINOR;
- rStream << SFX_ITEMPOOL_TAG_TRICK4OLD;
+ : SFX_ITEMPOOL_TAG_STARTPOOL_4 );
+ rStream.WriteUInt8( SFX_ITEMPOOL_VER_MAJOR ).WriteUInt8( SFX_ITEMPOOL_VER_MINOR );
+ rStream.WriteUInt16( SFX_ITEMPOOL_TAG_TRICK4OLD );
// SfxStyleSheet-Bug umgehen
- rStream << sal_uInt16(0); // Version
- rStream << sal_uInt16(0); // Count (2. Schleife f"allt sonst auf die Fresse)
+ rStream.WriteUInt16( sal_uInt16(0) ); // Version
+ rStream.WriteUInt16( sal_uInt16(0) ); // Count (2. Schleife f"allt sonst auf die Fresse)
}
// jeder Pool ist als ganzes ein Record
@@ -135,7 +135,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
// Einzel-Header (Version des Inhalts und Name)
{
SfxMiniRecordWriter aPoolHeaderRec( &rStream, SFX_ITEMPOOL_REC_HEADER);
- rStream << pImp->nVersion;
+ rStream.WriteUInt16( pImp->nVersion );
SfxPoolItem::writeByteString(rStream, pImp->aName);
}
@@ -146,18 +146,18 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
{
aVerRec.NewContent();
SfxPoolVersion_ImplPtr pVer = pImp->aVersions[nVerNo];
- rStream << pVer->_nVer << pVer->_nStart << pVer->_nEnd;
+ rStream.WriteUInt16( pVer->_nVer ).WriteUInt16( pVer->_nStart ).WriteUInt16( pVer->_nEnd );
sal_uInt16 nCount = pVer->_nEnd - pVer->_nStart + 1;
sal_uInt16 nNewWhich = 0;
for ( sal_uInt16 n = 0; n < nCount; ++n )
{
nNewWhich = pVer->_pMap[n];
- rStream << nNewWhich;
+ rStream.WriteUInt16( nNewWhich );
}
// Workaround gegen Bug in SetVersionMap der 312
if ( SOFFICE_FILEFORMAT_31 == pImp->mnFileFormatVersion )
- rStream << sal_uInt16(nNewWhich+1);
+ rStream.WriteUInt16( sal_uInt16(nNewWhich+1) );
}
}
@@ -189,11 +189,11 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
// eigene Kennung, globale Which-Id und Item-Version
sal_uInt16 nSlotId = GetSlotId( (*ppDefItem)->Which(), sal_False );
aWhichIdsRec.NewContent(nSlotId, 0);
- rStream << (*ppDefItem)->Which();
- rStream << nItemVersion;
+ rStream.WriteUInt16( (*ppDefItem)->Which() );
+ rStream.WriteUInt16( nItemVersion );
const sal_uInt32 nCount = ::std::min<size_t>( (*itrArr)->size(), SAL_MAX_UINT32 );
DBG_ASSERT(nCount, "ItemArr is empty");
- rStream << nCount;
+ rStream.WriteUInt32( nCount );
// Items an sich schreiben
SfxMultiMixRecordWriter aItemsRec( &rStream, SFX_ITEMPOOL_REC_ITEMS, 0 );
@@ -206,10 +206,10 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
aItemsRec.NewContent((sal_uInt16)j, 'X' );
if ( pItem->GetRefCount() == SFX_ITEMS_SPECIAL )
- rStream << (sal_uInt16) pItem->GetKind();
+ rStream.WriteUInt16( (sal_uInt16) pItem->GetKind() );
else
{
- rStream << (sal_uInt16) pItem->GetRefCount();
+ rStream.WriteUInt16( (sal_uInt16) pItem->GetRefCount() );
if( pItem->GetRefCount() > SFX_ITEMS_OLD_MAXREF )
rStream.SetError( ERRCODE_IO_NOTSTORABLEINBINARYFORMAT );
}
@@ -258,8 +258,8 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
// eigene Kennung, globale Kennung, Version
sal_uInt16 nSlotId = GetSlotId( pDefaultItem->Which(), sal_False );
aDefsRec.NewContent( nSlotId, 0 );
- rStream << pDefaultItem->Which();
- rStream << nItemVersion;
+ rStream.WriteUInt16( pDefaultItem->Which() );
+ rStream.WriteUInt16( nItemVersion );
// Item an sich
pDefaultItem->Store( rStream, nItemVersion );
@@ -1171,13 +1171,13 @@ bool SfxItemPool::StoreSurrogate
if ( pItem )
{
bool bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE);
- rStream << ( bRealSurrogate
+ rStream.WriteUInt32( bRealSurrogate
? GetSurrogate( pItem )
- : SFX_ITEMS_DIRECT );
+ : SFX_ITEMS_DIRECT );
return bRealSurrogate;
}
- rStream << SFX_ITEMS_NULL;
+ rStream.WriteUInt32( SFX_ITEMS_NULL );
return sal_True;
}
@@ -1510,16 +1510,16 @@ bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
if ( USHRT_MAX == nItemVersion )
return sal_False;
- rStream << rItem.Which() << nSlotId;
+ rStream.WriteUInt16( rItem.Which() ).WriteUInt16( nSlotId );
if ( bDirect || !pPool->StoreSurrogate( rStream, &rItem ) )
{
- rStream << nItemVersion;
- rStream << (sal_uInt32) 0L; // Platz fuer Laenge in Bytes
+ rStream.WriteUInt16( nItemVersion );
+ rStream.WriteUInt32( (sal_uInt32) 0L ); // Platz fuer Laenge in Bytes
sal_uLong nIStart = rStream.Tell();
rItem.Store(rStream, nItemVersion);
sal_uLong nIEnd = rStream.Tell();
rStream.Seek( nIStart-4 );
- rStream << (sal_Int32) ( nIEnd-nIStart );
+ rStream.WriteInt32( (sal_Int32) ( nIEnd-nIStart ) );
rStream.Seek( nIEnd );
}
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index edb013775d3a..e24ac9c75888 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -791,8 +791,8 @@ bool SvNumberFormatter::Save( SvStream& rStream ) const
ImpSvNumMultipleWriteHeader aHdr( rStream );
// As of 364i we store what SYSTEM locale really was, before it was hard
// coded LANGUAGE_SYSTEM.
- rStream << (sal_uInt16) SV_NUMBERFORMATTER_VERSION;
- rStream << (sal_uInt16) SvtSysLocale().GetLanguageTag().getLanguageType() << (sal_uInt16) IniLnge;
+ rStream.WriteUInt16( (sal_uInt16) SV_NUMBERFORMATTER_VERSION );
+ rStream.WriteUInt16( (sal_uInt16) SvtSysLocale().GetLanguageTag().getLanguageType() ).WriteUInt16( (sal_uInt16) IniLnge );
const SvNumberFormatTable* pTable = &aFTable;
SvNumberFormatTable::const_iterator it = pTable->begin();
@@ -805,18 +805,18 @@ bool SvNumberFormatter::Save( SvStream& rStream ) const
if ( pEntry->GetUsed() || (pEntry->GetType() & NUMBERFORMAT_DEFINED) ||
pEntry->GetNewStandardDefined() || (it->first % SV_COUNTRY_LANGUAGE_OFFSET == 0) )
{
- rStream << it->first
- << (sal_uInt16) LANGUAGE_SYSTEM
- << (sal_uInt16) pEntry->GetLanguage();
+ rStream.WriteUInt32( it->first )
+ .WriteUInt16( (sal_uInt16) LANGUAGE_SYSTEM )
+ .WriteUInt16( (sal_uInt16) pEntry->GetLanguage() );
pEntry->Save(rStream, aHdr);
}
++it;
}
- rStream << NUMBERFORMAT_ENTRY_NOT_FOUND; // end marker
+ rStream.WriteUInt32( NUMBERFORMAT_ENTRY_NOT_FOUND ); // end marker
// as of SV_NUMBERFORMATTER_VERSION_YEAR2000
aHdr.StartEntry();
- rStream << (sal_uInt16) GetYear2000();
+ rStream.WriteUInt16( (sal_uInt16) GetYear2000() );
aHdr.EndEntry();
return rStream.GetError() ? false : true;
diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx
index 1e328c918811..2514ed73b65c 100644
--- a/svtools/source/graphic/grfattr.cxx
+++ b/svtools/source/graphic/grfattr.cxx
@@ -106,7 +106,7 @@ SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr )
const sal_uInt32 nTmp32 = 0;
rOStm.WriteUInt32( nTmp32 ).WriteUInt32( nTmp32 );
- rOStm << rAttr.mfGamma;
+ rOStm.WriteDouble( rAttr.mfGamma );
rOStm.WriteUInt32( rAttr.mnMirrFlags ).WriteUInt16( rAttr.mnRotate10 );
rOStm.WriteInt16( rAttr.mnContPercent ).WriteInt16( rAttr.mnLumPercent ).WriteInt16( rAttr.mnRPercent ).WriteInt16( rAttr.mnGPercent ).WriteInt16( rAttr.mnBPercent );
rOStm.WriteUChar( rAttr.mbInvert ).WriteUChar( rAttr.mcTransparency ).WriteUInt16( (sal_uInt16) rAttr.meDrawMode );
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 5afe6a7ffb68..34244ac7a6ae 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -82,15 +82,15 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
IMapCompat* pCompat;
const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding();
- rOStm << GetType();
- rOStm << GetVersion();
- rOStm << ( (sal_uInt16) eEncoding );
+ rOStm.WriteUInt16( GetType() );
+ rOStm.WriteUInt16( GetVersion() );
+ rOStm.WriteUInt16( (sal_uInt16) eEncoding );
const OString aRelURL = OUStringToOString(
URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding);
write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, aRelURL);
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aAltText, eEncoding);
- rOStm << bActive;
+ rOStm.WriteUChar( bActive );
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aTarget, eEncoding);
pCompat = new IMapCompat( rOStm, STREAM_WRITE );
@@ -293,7 +293,7 @@ void IMapCircleObject::WriteIMapObject( SvStream& rOStm ) const
sal_uInt32 nTmp = nRadius;
WritePair( rOStm, aCenter );
- rOStm << nTmp;
+ rOStm.WriteUInt32( nTmp );
}
@@ -432,7 +432,7 @@ void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, sal_Bool bPixel )
void IMapPolygonObject::WriteIMapObject( SvStream& rOStm ) const
{
WritePolygon( rOStm, aPoly );
- rOStm << bEllipse; // >= Version 2
+ rOStm.WriteUChar( bEllipse ); // >= Version 2
WriteRectangle( rOStm, aEllipse ); // >= Version 2
}
@@ -947,11 +947,11 @@ void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
// write MagicCode
- rOStm << IMAPMAGIC;
- rOStm << GetVersion();
+ rOStm.WriteCharPtr( IMAPMAGIC );
+ rOStm.WriteUInt16( GetVersion() );
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding);
write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); //dummy
- rOStm << nCount;
+ rOStm.WriteUInt16( nCount );
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding);
pCompat = new IMapCompat( rOStm, STREAM_WRITE );
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 22cb1a2d6b04..626325b59f8d 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -514,7 +514,7 @@ SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, const sal_Char *pStr,
sal_Char sStt[3] = "</";
if( bOn )
sStt[1] = 0;
- return (rStream << sStt << pStr << '>');
+ return (rStream.WriteCharPtr( sStt ).WriteCharPtr( pStr ).WriteChar( '>' ));
}
SvStream& HTMLOutFuncs::Out_Char( SvStream& rStream, sal_Unicode c,
@@ -522,7 +522,7 @@ SvStream& HTMLOutFuncs::Out_Char( SvStream& rStream, sal_Unicode c,
OUString *pNonConvertableChars )
{
OString sOut = lcl_ConvertCharToHTML( c, rContext, pNonConvertableChars );
- rStream << sOut.getStr();
+ rStream.WriteCharPtr( sOut.getStr() );
return rStream;
}
@@ -545,7 +545,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream,
OString sOut = lcl_FlushToAscii( rContext );
if (!sOut.isEmpty())
- rStream << sOut.getStr();
+ rStream.WriteCharPtr( sOut.getStr() );
return rStream;
}
@@ -568,17 +568,17 @@ SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nL
*pStr += 39;
nHex >>= 4;
}
- return rStream << pStr;
+ return rStream.WriteCharPtr( pStr );
}
SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor,
rtl_TextEncoding )
{
- rStream << "\"#";
+ rStream.WriteCharPtr( "\"#" );
if( rColor.GetColor() == COL_AUTO )
{
- rStream << "000000";
+ rStream.WriteCharPtr( "000000" );
}
else
{
@@ -586,7 +586,7 @@ SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor,
Out_Hex( rStream, rColor.GetGreen(), 2 );
Out_Hex( rStream, rColor.GetBlue(), 2 );
}
- rStream << '\"';
+ rStream.WriteChar( '\"' );
return rStream;
}
@@ -617,9 +617,9 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
.append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_name)
.append("=\"");
- rStream << sOut.makeStringAndClear().getStr();
+ rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() );
Out_String( rStream, rOutName, eDestEnc, pNonConvertableChars );
- rStream << "\">";
+ rStream.WriteCharPtr( "\">" );
for( sal_uInt16 i=0U; i<rIMap.GetIMapObjectCount(); i++ )
{
@@ -701,16 +701,16 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
if( pShape )
{
if( pDelim )
- rStream << pDelim;
+ rStream.WriteCharPtr( pDelim );
if( pIndentArea )
- rStream << pIndentArea;
+ rStream.WriteCharPtr( pIndentArea );
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_area)
.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_shape)
.append('=').append(pShape).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_coords).append("=\"")
.append(aCoords).append("\" ");
- rStream << sOut.makeStringAndClear().getStr();
+ rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() );
OUString aURL( pObj->GetURL() );
if( !aURL.isEmpty() && pObj->IsActive() )
@@ -718,19 +718,19 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
aURL = URIHelper::simpleNormalizedMakeRelative(
rBaseURL, aURL );
sOut.append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"");
- rStream << sOut.makeStringAndClear().getStr();
- Out_String( rStream, aURL, eDestEnc, pNonConvertableChars ) << '\"';
+ rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() );
+ Out_String( rStream, aURL, eDestEnc, pNonConvertableChars ).WriteChar( '\"' );
}
else
- rStream << OOO_STRING_SVTOOLS_HTML_O_nohref;
+ rStream.WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_nohref );
const OUString& rObjName = pObj->GetName();
if( !rObjName.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
.append("=\"");
- rStream << sOut.makeStringAndClear().getStr();
- Out_String( rStream, rObjName, eDestEnc, pNonConvertableChars ) << '\"';
+ rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() );
+ Out_String( rStream, rObjName, eDestEnc, pNonConvertableChars ).WriteChar( '\"' );
}
const OUString& rTarget = pObj->GetTarget();
@@ -738,8 +738,8 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_target)
.append("=\"");
- rStream << sOut.makeStringAndClear().getStr();
- Out_String( rStream, rTarget, eDestEnc, pNonConvertableChars ) << '\"';
+ rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() );
+ Out_String( rStream, rTarget, eDestEnc, pNonConvertableChars ).WriteChar( '\"' );
}
OUString rDesc( pObj->GetAltText() );
@@ -750,8 +750,8 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt)
.append("=\"");
- rStream << sOut.makeStringAndClear().getStr();
- Out_String( rStream, rDesc, eDestEnc, pNonConvertableChars ) << '\"';
+ rStream.WriteCharPtr( sOut.makeStringAndClear().getStr() );
+ Out_String( rStream, rDesc, eDestEnc, pNonConvertableChars ).WriteChar( '\"' );
}
const SvxMacroTableDtor& rMacroTab = pObj->GetMacroTable();
@@ -759,16 +759,16 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
Out_Events( rStream, rMacroTab, pEventTable,
bOutStarBasic, eDestEnc, pNonConvertableChars );
- rStream << '>';
+ rStream.WriteChar( '>' );
}
}
}
if( pDelim )
- rStream << pDelim;
+ rStream.WriteCharPtr( pDelim );
if( pIndentMap )
- rStream << pIndentMap;
+ rStream.WriteCharPtr( pIndentMap );
Out_AsciiTag( rStream, OOO_STRING_SVTOOLS_HTML_map, sal_False );
return rStream;
@@ -798,7 +798,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
sOut.append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_language)
.append("=\"");
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
Out_String( rStrm, rLanguage, eDestEnc, pNonConvertableChars );
sOut.append('\"');
}
@@ -806,7 +806,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
if( !rSrc.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src).append("=\"");
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(rBaseURL, rSrc), eDestEnc, pNonConvertableChars );
sOut.append('\"');
}
@@ -815,7 +815,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdlibrary)
.append("=\"");
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
Out_String( rStrm, *pSBLibrary, eDestEnc, pNonConvertableChars );
sOut.append('\"');
}
@@ -824,23 +824,23 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdmodule)
.append("=\"");
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
Out_String( rStrm, *pSBModule, eDestEnc, pNonConvertableChars );
sOut.append('\"');
}
sOut.append('>');
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
if( !rSource.isEmpty() || pSBLibrary || pSBModule )
{
- rStrm << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
if( JAVASCRIPT != eScriptType )
{
- rStrm << "<!--"
- << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( "<!--" )
+ .WriteCharPtr( SAL_NEWLINE_STRING );
}
if( STARBASIC == eScriptType )
@@ -851,7 +851,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
.append(OOO_STRING_SVTOOLS_HTML_SB_library)
.append(' ')
.append(OUStringToOString(*pSBLibrary, eDestEnc));
- rStrm << sOut.makeStringAndClear().getStr() << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ).WriteCharPtr( SAL_NEWLINE_STRING );
}
if( pSBModule )
@@ -860,7 +860,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
.append(OOO_STRING_SVTOOLS_HTML_SB_module)
.append(' ')
.append(OUStringToOString(*pSBModule, eDestEnc));
- rStrm << sOut.makeStringAndClear().getStr() << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() ).WriteCharPtr( SAL_NEWLINE_STRING );
}
}
@@ -869,16 +869,16 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
// we write the module in ANSI-charset, but with
// the system new line.
const OString sSource(OUStringToOString(rSource, eDestEnc));
- rStrm << sSource.getStr() << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( sSource.getStr() ).WriteCharPtr( SAL_NEWLINE_STRING );
}
- rStrm << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( 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 << (STARBASIC == eScriptType ? "' -->" : "// -->")
- << SAL_NEWLINE_STRING;
+ rStrm.WriteCharPtr( STARBASIC == eScriptType ? "' -->" : "// -->" )
+ .WriteCharPtr( SAL_NEWLINE_STRING );
}
}
@@ -912,9 +912,9 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
{
OStringBuffer sOut;
sOut.append(' ').append(pStr).append("=\"");
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
- Out_String( rStrm, pMacro->GetMacName(), eDestEnc, pNonConvertableChars ) << '\"';
+ Out_String( rStrm, pMacro->GetMacName(), eDestEnc, pNonConvertableChars ).WriteChar( '\"' );
}
}
i++;
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 682e99c72d1e..12839ed064cf 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -36,13 +36,13 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
// written
break;
case 0xA0:
- rStream << "\\~";
+ rStream.WriteCharPtr( "\\~" );
break;
case 0xAD:
- rStream << "\\-";
+ rStream.WriteCharPtr( "\\-" );
break;
case 0x2011:
- rStream << "\\_";
+ rStream.WriteCharPtr( "\\_" );
break;
case '\n':
pStr = OOO_STRING_SVTOOLS_RTF_LINE;
@@ -87,11 +87,11 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
case '\\':
case '}':
case '{':
- rStream << '\\' << (sal_Char)c;
+ rStream.WriteChar( '\\' ).WriteChar( (sal_Char)c );
break;
default:
if (c >= ' ' && c <= '~')
- rStream << (sal_Char)c;
+ rStream.WriteChar( (sal_Char)c );
else
{
//If we can't convert to the dest encoding, or if
@@ -121,18 +121,18 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
{
// #i47831# add an additional whitespace, so that
// "document whitespaces" are not ignored.;
- rStream << "\\uc"
- << OString::number(nLen).getStr() << " ";
+ rStream.WriteCharPtr( "\\uc" )
+ .WriteCharPtr( OString::number(nLen).getStr() ).WriteCharPtr( " " );
*pUCMode = nLen;
}
- rStream << "\\u"
- << OString::number(
- static_cast<sal_Int32>(c)).getStr();
+ rStream.WriteCharPtr( "\\u" )
+ .WriteCharPtr( OString::number(
+ static_cast<sal_Int32>(c)).getStr() );
}
for (sal_Int32 nI = 0; nI < nLen; ++nI)
{
- rStream << "\\'";
+ rStream.WriteCharPtr( "\\'" );
Out_Hex(rStream, sConverted[nI], 2);
}
}
@@ -142,7 +142,7 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
}
if (pStr)
- rStream << pStr << ' ';
+ rStream.WriteCharPtr( pStr ).WriteChar( ' ' );
return rStream;
}
@@ -154,7 +154,7 @@ SvStream& RTFOutFuncs::Out_String( SvStream& rStream, const OUString& rStr,
for (sal_Int32 n = 0; n < rStr.getLength(); ++n)
Out_Char(rStream, rStr[n], &nUCMode, eDestEnc, bWriteHelpFile);
if (nUCMode != 1)
- rStream << "\\uc1"<< " "; // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.;
+ rStream.WriteCharPtr( "\\uc1" ).WriteCharPtr( " " ); // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.;
return rStream;
}
@@ -175,7 +175,7 @@ SvStream& RTFOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLe
*pStr += 39;
nHex >>= 4;
}
- return rStream << pStr;
+ return rStream.WriteCharPtr( pStr );
}
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 217989f891fd..8cec8a55248f 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -163,7 +163,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString&
SfxMedium aOut( sPath, STREAM_WRITE | STREAM_SHARE_DENYNONE);
if( aOut.GetOutStream() && !aOut.GetOutStream()->GetError())
{
- *aOut.GetOutStream() << *aIn.GetInStream();
+ aOut.GetOutStream()->WriteStream( *aIn.GetInStream() );
if ( 0 == aIn.GetError() )
{
aOut.Close();
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index fca950f8660f..0632722b0781 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -555,7 +555,7 @@ sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pU
if( pUserObject )
{
- *rxOStm << *static_cast< SotStorageStream* >( pUserObject );
+ rxOStm->WriteStream( *static_cast< SotStorageStream* >( pUserObject ) );
bRet = ( rxOStm->GetError() == ERRCODE_NONE );
}
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 8d4f6fb4c704..3567a0e56075 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -319,7 +319,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPt
if( pOStm )
{
- *pOStm << nNextNumber;
+ pOStm->WriteUInt32( nNextNumber );
delete pOStm;
}
@@ -1294,9 +1294,9 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
sal_uInt32 nCount = GetObjectCount();
sal_Bool bRel;
- rOStm << (sal_uInt16) 0x0004;
+ rOStm.WriteUInt16( (sal_uInt16) 0x0004 );
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8);
- rOStm << nCount << (sal_uInt16) osl_getThreadTextEncoding();
+ rOStm.WriteUInt32( nCount ).WriteUInt16( (sal_uInt16) osl_getThreadTextEncoding() );
for( sal_uInt32 i = 0; i < nCount; i++ )
{
@@ -1346,19 +1346,19 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
<< m_aDestDir << "' in '" << aPath << "'");
}
- rOStm << bRel;
+ rOStm.WriteUChar( bRel );
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aPath, RTL_TEXTENCODING_UTF8);
- rOStm << pObj->nOffset << (sal_uInt16) pObj->eObjKind;
+ rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( (sal_uInt16) pObj->eObjKind );
}
// more recently, a 512-byte reserve buffer is written,
// to recognize them two sal_uIntPtr-Ids will be written.
- rOStm << COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) << COMPAT_FORMAT( 'E', 'S', 'R', 'V' );
+ rOStm.WriteUInt32( COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) ).WriteUInt32( COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) );
const long nReservePos = rOStm.Tell();
VersionCompat* pCompat = new VersionCompat( rOStm, STREAM_WRITE, 2 );
- rOStm << (sal_uInt32) GetId() << IsThemeNameFromResource(); // From version 2 and up
+ rOStm.WriteUInt32( (sal_uInt32) GetId() ).WriteUChar( IsThemeNameFromResource() ); // From version 2 and up
delete pCompat;
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 5ec07a2463d9..6398e4baecb2 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -289,7 +289,7 @@ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const
SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) const
{
- rOut << fVal;
+ rOut.WriteDouble( fVal );
return rOut;
}
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 517e9e41589b..2a3a14051cec 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -102,9 +102,9 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/
// ## if (nItemVersion)
double fValue;
- fValue = aVal.getX(); rStream << fValue;
- fValue = aVal.getY(); rStream << fValue;
- fValue = aVal.getZ(); rStream << fValue;
+ fValue = aVal.getX(); rStream.WriteDouble( fValue );
+ fValue = aVal.getY(); rStream.WriteDouble( fValue );
+ fValue = aVal.getZ(); rStream.WriteDouble( fValue );
return rStream;
}
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index c9c1de6bd333..5c643ad9dd84 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -85,8 +85,8 @@ long HundMMToTwips( long nIn )
sal_uLong SdrTableRtfExporter::Write()
{
- mrStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
- mrStrm << OOO_STRING_SVTOOLS_RTF_ANSI << SAL_NEWLINE_STRING;
+ mrStrm.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF );
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING );
Reference< XTableColumns > xColumns( mxTable->getColumns() );
const sal_Int32 nColCount = xColumns->getCount();
@@ -125,7 +125,7 @@ sal_uLong SdrTableRtfExporter::Write()
OSL_FAIL("SdrTableRtfExporter::Write(), exception caught!");
}
- mrStrm << '}' << SAL_NEWLINE_STRING;
+ mrStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
return mrStrm.GetError();
}
@@ -134,8 +134,8 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
sal_Int32 nRowHeight = 0;
xRowSet->getPropertyValue( msSize ) >>= nRowHeight;
- mrStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30";
- mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::number(nRowHeight).getStr();
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH ).WriteCharPtr( "30" ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRLEFT ).WriteCharPtr( "-30" );
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRRH ).WriteCharPtr( OString::number(nRowHeight).getStr() );
const sal_Int32 nColCount = mxTable->getColumnCount();
for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
@@ -145,11 +145,11 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
if( !xCell.is() )
continue;
- mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::number(aColumnStart[nCol]).getStr();
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteCharPtr( OString::number(aColumnStart[nCol]).getStr() );
if ( (nCol & 0x0F) == 0x0F )
- mrStrm << SAL_NEWLINE_STRING; // Zeilen nicht zu lang werden lassen
+ mrStrm.WriteCharPtr( SAL_NEWLINE_STRING ); // Zeilen nicht zu lang werden lassen
}
- mrStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << SAL_NEWLINE_STRING;
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL ).WriteCharPtr( SAL_NEWLINE_STRING );
sal_uLong nStrmPos = mrStrm.Tell();
for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
@@ -157,11 +157,11 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
WriteCell( nCol, nRow );
if ( mrStrm.Tell() - nStrmPos > 255 )
{
- mrStrm << SAL_NEWLINE_STRING;
+ mrStrm.WriteCharPtr( SAL_NEWLINE_STRING );
nStrmPos = mrStrm.Tell();
}
}
- mrStrm << OOO_STRING_SVTOOLS_RTF_ROW << SAL_NEWLINE_STRING;
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW ).WriteCharPtr( SAL_NEWLINE_STRING );
}
@@ -171,7 +171,7 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow )
if( !xCell.is() || xCell->isMerged() )
{
- mrStrm << OOO_STRING_SVTOOLS_RTF_CELL;
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL );
return ;
}
@@ -218,32 +218,32 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow )
case SDRTEXTHORZADJUST_LEFT:
default: pChar = OOO_STRING_SVTOOLS_RTF_QL; break;
}
- mrStrm << pChar;
+ mrStrm.WriteCharPtr( pChar );
if ( rWeightItem.GetWeight() >= WEIGHT_BOLD )
{ // bold
bResetAttr = true;
- mrStrm << OOO_STRING_SVTOOLS_RTF_B;
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_B );
}
if ( rPostureItem.GetPosture() != ITALIC_NONE )
{ // italic
bResetAttr = true;
- mrStrm << OOO_STRING_SVTOOLS_RTF_I;
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I );
}
if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE )
{ // underline
bResetAttr = true;
- mrStrm << OOO_STRING_SVTOOLS_RTF_UL;
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL );
}
- mrStrm << ' ';
+ mrStrm.WriteChar( ' ' );
RTFOutFuncs::Out_String( mrStrm, aContent );
- mrStrm << OOO_STRING_SVTOOLS_RTF_CELL;
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL );
if ( bResetPar )
- mrStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL;
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL );
if ( bResetAttr )
- mrStrm << OOO_STRING_SVTOOLS_RTF_PLAIN;
+ mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN );
}
} }
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 57344500d64c..e698b97881a7 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -1053,7 +1053,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
// copy temp stream to XOutputStream
SvOutputStream aOutputStream( aSettings.mxOutputStream );
aStream.Seek(0);
- aOutputStream << aStream;
+ aOutputStream.WriteStream( aStream );
}
else
{
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 1cfe73891633..92c94d2ec87c 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1198,8 +1198,8 @@ namespace
for(sal_uInt32 b(0L); b < nPointCount; b++)
{
const basegfx::B2DPoint aPoint(aCandidate.getB2DPoint(b));
- rOut << aPoint.getX();
- rOut << aPoint.getY();
+ rOut.WriteDouble( aPoint.getX() );
+ rOut.WriteDouble( aPoint.getY() );
if(bControlPoints)
{
@@ -1209,12 +1209,12 @@ namespace
if(bEdgeIsCurve)
{
const basegfx::B2DVector aControlVectorA(aCandidate.getPrevControlPoint(b));
- rOut << aControlVectorA.getX();
- rOut << aControlVectorA.getY();
+ rOut.WriteDouble( aControlVectorA.getX() );
+ rOut.WriteDouble( aControlVectorA.getY() );
const basegfx::B2DVector aControlVectorB(aCandidate.getNextControlPoint(b));
- rOut << aControlVectorB.getX();
- rOut << aControlVectorB.getY();
+ rOut.WriteDouble( aControlVectorB.getX() );
+ rOut.WriteDouble( aControlVectorB.getY() );
}
}
}
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index c931ae99437f..1a3bb726cc0e 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -273,12 +273,12 @@ SfxPoolItem* AffineMatrixItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/ ) cons
SvStream& AffineMatrixItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ ) const
{
- rStream << maMatrix.m00;
- rStream << maMatrix.m01;
- rStream << maMatrix.m02;
- rStream << maMatrix.m10;
- rStream << maMatrix.m11;
- rStream << maMatrix.m12;
+ rStream.WriteDouble( maMatrix.m00 );
+ rStream.WriteDouble( maMatrix.m01 );
+ rStream.WriteDouble( maMatrix.m02 );
+ rStream.WriteDouble( maMatrix.m10 );
+ rStream.WriteDouble( maMatrix.m11 );
+ rStream.WriteDouble( maMatrix.m12 );
return rStream;
}
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 5ff83664e8c5..d251ef85c782 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -217,9 +217,9 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
OutNewLine();
sOut.append("<" + OString(OOO_STRING_SVTOOLS_HTML_style) + " " +
OString(OOO_STRING_SVTOOLS_HTML_O_type) + "=\"text/css\">");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OutNewLine();
- Strm() << '<' << OOO_STRING_SVTOOLS_HTML_comment;
+ Strm().WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_comment );
IncIndentLevel();
}
@@ -265,7 +265,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
if( nCSS1OutMode & CSS1_OUTMODE_ENCODE )
{
// In STYLE-Optionen den String codieren
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
if( pVal )
HTMLOutFuncs::Out_String( Strm(), OUString::createFromAscii(pVal),
eDestEnc, &aNonConvertableCharacters );
@@ -282,7 +282,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
}
if (!sOut.isEmpty())
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
}
static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
@@ -516,7 +516,7 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet,
break;
}
if (!sOut.isEmpty())
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
}
}
@@ -633,7 +633,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed )
{
DecIndentLevel();
OutNewLine();
- Strm() << "-->";
+ Strm().WriteCharPtr( "-->" );
OutNewLine();
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_style, sal_False );
@@ -1809,12 +1809,12 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
{
rHTMLWrt.OutNewLine();
OString sTmp(OUStringToOString(aSelector, rHTMLWrt.eDestEnc));
- rWrt.Strm() << sTmp.getStr() << " {";
+ rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteCharPtr( " {" );
rHTMLWrt.bFirstCSS1Property = sal_False;
}
if( !rHTMLWrt.bFirstCSS1Property )
- rWrt.Strm() << sCSS1_rule_end;
+ rWrt.Strm().WriteCharPtr( sCSS1_rule_end );
return rWrt;
}
@@ -1835,7 +1835,7 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
true, &aSelector );
rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_font_size,
sHTML_FTN_fontheight );
- rHTMLWrt.Strm() << sCSS1_rule_end;
+ rHTMLWrt.Strm().WriteCharPtr( sCSS1_rule_end );
}
const SwCharFmt *pSymCharFmt = rInfo.GetCharFmt( *pDoc );
@@ -1899,7 +1899,7 @@ Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet )
{
// wenn eine Property als Bestandteil einer Style-Option
// ausgegeben wurde, muss die Optiomn noch beendet werden
- rWrt.Strm() << '\"';
+ rWrt.Strm().WriteChar( '\"' );
}
return rWrt;
@@ -1926,7 +1926,7 @@ Writer& OutCSS1_HintSpanTag( Writer& rWrt, const SfxPoolItem& rHt )
Out( aCSS1AttrFnTab, rHt, rWrt );
if( !rHTMLWrt.bFirstCSS1Property && rHTMLWrt.bTagOn )
- rWrt.Strm() << sCSS1_span_tag_end;
+ rWrt.Strm().WriteCharPtr( sCSS1_span_tag_end );
return rWrt;
}
@@ -1942,7 +1942,7 @@ Writer& OutCSS1_HintStyleOpt( Writer& rWrt, const SfxPoolItem& rHt )
Out( aCSS1AttrFnTab, rHt, rWrt );
if( !rHTMLWrt.bFirstCSS1Property )
- rWrt.Strm() << '\"';
+ rWrt.Strm().WriteChar( '\"' );
return rWrt;
}
@@ -1958,7 +1958,7 @@ Writer& OutCSS1_TableBGStyleOpt( Writer& rWrt, const SfxPoolItem& rHt )
OutCSS1_SvxBrush( rWrt, rHt, CSS1_BACKGROUND_TABLE );
if( !rHTMLWrt.bFirstCSS1Property )
- rWrt.Strm() << '\"';
+ rWrt.Strm().WriteChar( '\"' );
return rWrt;
}
@@ -1993,7 +1993,7 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_text_indent, nFirstLineOffset );
if( !rHTMLWrt.bFirstCSS1Property )
- rWrt.Strm() << '\"';
+ rWrt.Strm().WriteChar( '\"' );
return rWrt;
}
@@ -2195,7 +2195,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
OutCSS1_SfxItemSet( *pItemSet, sal_False );
if( !bFirstCSS1Property )
- Strm() << '\"';
+ Strm().WriteChar( '\"' );
}
void SwHTMLWriter::OutCSS1_TableFrmFmtOptions( const SwFrmFmt& rFrmFmt )
@@ -2216,7 +2216,7 @@ void SwHTMLWriter::OutCSS1_TableFrmFmtOptions( const SwFrmFmt& rFrmFmt )
OutCSS1_SwFmtLayoutSplit( *this, *pItem );
if( !bFirstCSS1Property )
- Strm() << '\"';
+ Strm().WriteChar( '\"' );
}
void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrmFmt const& rFrmFmt)
@@ -2226,7 +2226,7 @@ void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrmFmt const& rFrmFmt)
OutCSS1_SvxBox(*this, rFrmFmt.GetBox());
if (!bFirstCSS1Property)
{
- this->Strm() << cCSS1_style_opt_end;
+ this->Strm().WriteChar( cCSS1_style_opt_end );
}
}
@@ -2248,7 +2248,7 @@ void SwHTMLWriter::OutCSS1_SectionFmtOptions( const SwFrmFmt& rFrmFmt, const SwF
}
if( !bFirstCSS1Property )
- Strm() << '\"';
+ Strm().WriteChar( '\"' );
}
static bool OutCSS1_FrmFmtBrush( SwHTMLWriter& rWrt,
@@ -2949,7 +2949,7 @@ static void OutCSS1_SwFmtDropAttrs( SwHTMLWriter& rHWrt,
else if( pDCCharFmt )
rHWrt.OutCSS1_SfxItemSet( pDCCharFmt->GetAttrSet() );
else if( (rHWrt.nCSS1OutMode & CSS1_OUTMODE_ANY_OFF) == CSS1_OUTMODE_RULE_OFF )
- rHWrt.Strm() << sCSS1_rule_end;
+ rHWrt.Strm().WriteCharPtr( sCSS1_rule_end );
}
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index bf65c4f83251..351d4ff6cdee 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -645,7 +645,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// nur einen Zeilen-Umbruch (ohne Einrueckung) am Absatz-Anfang
// ausgeben
rInfo.aToken = OString(); // kein End-Tag ausgeben
- rWrt.Strm() << SAL_NEWLINE_STRING;
+ rWrt.Strm().WriteCharPtr( SAL_NEWLINE_STRING );
return;
}
@@ -806,7 +806,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
append("=\"").append(static_cast<sal_Int32>(nNumStart)).append("\"");
}
sOut.append('>');
- rWrt.Strm() << sOut.getStr();
+ rWrt.Strm().WriteCharPtr( sOut.getStr() );
}
if( rHWrt.nDefListLvl > 0 && !bForceDL )
@@ -823,12 +823,12 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// all text behind the control does not recognize this attribute.
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division);
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rHWrt.bTxtAttr = sal_False;
rHWrt.bOutOpts = sal_True;
OutHTML_SvxAdjust( rWrt, *pAdjItem );
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
pAdjItem = 0;
rHWrt.bNoAlign = sal_False;
rInfo.bOutDiv = sal_True;
@@ -905,14 +905,14 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
if( eLang != LANGUAGE_DONTKNOW && eLang != rHWrt.eLang )
{
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rHWrt.OutLanguage( eLang );
}
if( nDir != rHWrt.nDirection )
{
if( !sOut.isEmpty() )
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rHWrt.OutDirection( nDir );
}
@@ -921,7 +921,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_class)
.append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OUString aClass( pFmtInfo->aClass );
if( pFmtInfo->bScriptDependent )
{
@@ -944,7 +944,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
rHWrt.eDestEnc, &rHWrt.aNonConvertableCharacters );
sOut.append('\"');
}
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// ggf. Ausrichtung ausgeben.
if( !rHWrt.bNoAlign && pAdjItem )
@@ -956,7 +956,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
OutCSS1_ParaTagStyleOpt( rWrt, *rInfo.pItemSet );
}
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
// Soll ein </P> geschrieben wenrden
rInfo.bOutPara =
@@ -2105,7 +2105,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
const SfxItemSet* pItemSet = pNd->GetpSwAttrSet();
if( !pItemSet )
{
- rWrt.Strm() << sOut.makeStringAndClear().getStr() << '>';
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ).WriteChar( '>' );
return rHTMLWrt;
}
const SfxPoolItem* pItem;
@@ -2138,8 +2138,8 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width)
.append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
- rWrt.OutULong( rHTMLWrt.ToPixel(nPageWidth-nLeft-nRight,false) ) << "\"";
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+ rWrt.OutULong( rHTMLWrt.ToPixel(nPageWidth-nLeft-nRight,false) ).WriteCharPtr( "\"" );
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align)
.append("=\"");
@@ -2152,7 +2152,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
sOut.append("\"");
}
}
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
if( SFX_ITEM_SET == pItemSet->GetItemState( RES_BOX, sal_False, &pItem ))
{
const SvxBoxItem* pBoxItem = (const SvxBoxItem*)pItem;
@@ -2162,15 +2162,15 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
sal_uInt16 nWidth = pBorderLine->GetScaledWidth();
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_size)
.append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
- rWrt.OutULong( rHTMLWrt.ToPixel(nWidth,false) ) << "\"";
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+ rWrt.OutULong( rHTMLWrt.ToPixel(nWidth,false) ).WriteCharPtr( "\"" );
const Color& rBorderColor = pBorderLine->GetColor();
if( !rBorderColor.IsRGBEqual( Color(COL_GRAY) ) )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_color)
.append("=");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_Color( rWrt.Strm(), rBorderColor,
rHTMLWrt.eDestEnc );
}
@@ -2178,11 +2178,11 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
if( !pBorderLine->GetInWidth() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_noshade);
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
}
}
}
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
return rHTMLWrt;
}
@@ -2265,7 +2265,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
}
if( bPageBreakBefore )
- rWrt.Strm() << '\f';
+ rWrt.Strm().WriteChar( '\f' );
}
// eventuell eine Form oeffnen
@@ -2570,7 +2570,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
OString sOut("&#");
sOut += OString::number( (sal_uInt64)c );
sOut += ";";
- rWrt.Strm() << sOut.getStr();
+ rWrt.Strm().WriteCharPtr( sOut.getStr() );
}
else
HTMLOutFuncs::Out_Char( rWrt.Strm(), (sal_Unicode)c, aContext, &rHTMLWrt.aNonConvertableCharacters );
@@ -2608,7 +2608,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
// Wenn der letzte Absatz einer Tabellezelle leer ist und
// wir fuer den MS-IE exportieren, schreiben wir statt eines
// <BR> ein &nbsp;
- rWrt.Strm() << '&' << OOO_STRING_SVTOOLS_HTML_S_nbsp << ';';
+ rWrt.Strm().WriteChar( '&' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_S_nbsp ).WriteChar( ';' );
}
else
{
@@ -2658,7 +2658,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
rHTMLWrt.OutForm( sal_False );
if( bPageBreakBehind )
- rWrt.Strm() << '\f';
+ rWrt.Strm().WriteChar( '\f' );
return rHTMLWrt;
}
@@ -2714,8 +2714,8 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_font).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_color).append("=");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
- HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor, rHTMLWrt.eDestEnc ) << '>';
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+ HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor, rHTMLWrt.eDestEnc ).WriteChar( '>' );
}
else
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, sal_False );
@@ -2758,9 +2758,9 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const SfxPoolItem& rHt )
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_font).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_face).append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), aNames, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters )
- << "\">";
+ .WriteCharPtr( "\">" );
}
else
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font , sal_False );
@@ -2783,14 +2783,14 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt )
sal_uInt16 nSize = rHTMLWrt.GetHTMLFontSize( nHeight );
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_size).append("=\"").
append(static_cast<sal_Int32>(nSize)).append("\"");
- rWrt.Strm() << sOut.getStr();
+ rWrt.Strm().WriteCharPtr( sOut.getStr() );
if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr )
{
// always export font size as CSS option, too
OutCSS1_HintStyleOpt( rWrt, rHt );
}
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
}
else
{
@@ -2814,9 +2814,9 @@ static Writer& OutHTML_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt )
{
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_span);
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rHTMLWrt.OutLanguage( ((const SvxLanguageItem &)rHt).GetLanguage() );
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
}
else
{
@@ -3021,7 +3021,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bO
sOut.append('\"');
}
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OUString sRel;
@@ -3037,7 +3037,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bO
aURL = comphelper::string::strip(aURL, ' ');
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rHTMLWrt.OutHyperlinkHRefValue( aURL );
sOut.append('\"');
}
@@ -3045,7 +3045,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bO
if( !rINetFmt.GetName().isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), rINetFmt.GetName(),
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
@@ -3055,7 +3055,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bO
if( !rTarget.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_target).append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), rTarget, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
@@ -3064,13 +3064,13 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bO
sOut.append(OUStringToOString(sRel, RTL_TEXTENCODING_ASCII_US));
if( !sOut.isEmpty() )
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
if( bEvents )
HTMLOutFuncs::Out_Events( rWrt.Strm(), *pMacTable, aAnchorEventTable,
rHTMLWrt.bCfgStarBasic, rHTMLWrt.eDestEnc,
&rHTMLWrt.aNonConvertableCharacters );
- rWrt.Strm() << ">";
+ rWrt.Strm().WriteCharPtr( ">" );
return rWrt;
}
@@ -3162,7 +3162,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_class)
.append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OUString aClass( pFmtInfo->aClass );
if( pFmtInfo->bScriptDependent )
{
@@ -3186,7 +3186,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
sOut.append('\"');
}
sOut.append('>');
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
}
else
{
@@ -3221,7 +3221,7 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
OStringBuffer sOut;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"")
.append(pStr).append("\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
}
return rWrt;
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index bd402485d405..32ed74ab85db 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -294,14 +294,14 @@ void SwHTMLWriter::OutBasic()
.append(OOO_STRING_SVTOOLS_HTML_META_content_script_type)
.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content)
.append("=\"text/x-");
- Strm() << sOut.getStr();
+ Strm().WriteCharPtr( sOut.getStr() );
// Entities aren't welcome here
- Strm() << OUStringToOString(sLang, eDestEnc).getStr()
- << "\">";
+ Strm().WriteCharPtr( OUStringToOString(sLang, eDestEnc).getStr() )
+ .WriteCharPtr( "\">" );
}
const OUString& rModName = pModule->GetName();
- Strm() << SAL_NEWLINE_STRING; // nicht einruecken!
+ Strm().WriteCharPtr( SAL_NEWLINE_STRING ); // nicht einruecken!
HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource(),
sLang, eType, aEmptyOUStr,
&rLibName, &rModName,
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index e78e6d0c06b7..0f31ce027b5a 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1730,7 +1730,7 @@ sal_Bool SwHTMLParser::FileDownload( const OUString& rURL,
if( pStream )
{
SvMemoryStream aStream;
- aStream << *pStream;
+ aStream.WriteStream( *pStream );
aStream.Seek( STREAM_SEEK_TO_END );
rStr = OUString((const sal_Char *)aStream.GetData(), aStream.Tell(),
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 6e03137d1615..718493485b57 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -179,9 +179,9 @@ static void lcl_html_outEvents( SvStream& rStrm,
RTL_TEXTENCODING_ASCII_US));
}
sOut.append("=\"");
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rStrm, pDescs[i].ScriptCode, eDestEnc, pNonConvertableChars );
- rStrm << '\"';
+ rStrm.WriteChar( '\"' );
if( EXTENDED_STYPE == eScriptType &&
!pDescs[i].AddListenerParam.isEmpty() )
{
@@ -192,10 +192,10 @@ static void lcl_html_outEvents( SvStream& rStrm,
.append(OUStringToOString(sMethod,
RTL_TEXTENCODING_ASCII_US))
.append("=\"");
- rStrm << sOut.makeStringAndClear().getStr();
+ rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rStrm, pDescs[i].AddListenerParam,
eDestEnc, pNonConvertableChars );
- rStrm << '\"';
+ rStrm.WriteChar( '\"' );
}
}
}
@@ -480,7 +480,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
!((OUString*)aTmp.getValue())->isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), *(OUString*)aTmp.getValue(),
eDestEnc, &aNonConvertableCharacters );
sOut.append('\"');
@@ -492,7 +492,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
!((OUString*)aTmp.getValue())->isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_action).append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OUString aURL( *(OUString*)aTmp.getValue() );
aURL = URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), aURL);
HTMLOutFuncs::Out_String( Strm(), aURL, eDestEnc, &aNonConvertableCharacters );
@@ -544,16 +544,16 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
!((OUString*)aTmp.getValue())->isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_target).append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), *(OUString*)aTmp.getValue(),
eDestEnc, &aNonConvertableCharacters );
sOut.append('\"');
}
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
uno::Reference< form::XFormComponent > xFormComp( rFormComps, uno::UNO_QUERY );
lcl_html_outEvents( Strm(), xFormComp, bCfgStarBasic, eDestEnc, &aNonConvertableCharacters );
- Strm() << '>';
+ Strm().WriteChar( '>' );
IncIndentLevel(); // Inhalt der Form einruecken
bLFPossible = sal_True;
@@ -620,7 +620,7 @@ void SwHTMLWriter::OutHiddenControls(
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
.append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), *(OUString*)aTmp.getValue(),
eDestEnc, &aNonConvertableCharacters );
sOut.append('\"');
@@ -632,13 +632,13 @@ void SwHTMLWriter::OutHiddenControls(
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value)
.append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), *(OUString*)aTmp.getValue(),
eDestEnc, &aNonConvertableCharacters );
sOut.append('\"');
}
sOut.append('>');
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
nFormCntrlCnt++;
}
@@ -980,7 +980,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name).
append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), *(OUString*)aTmp.getValue(),
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
@@ -997,7 +997,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value).append(
"=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), sValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
@@ -1013,7 +1013,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src).
append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(),
URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(), *(OUString*)aTmp.getValue()),
@@ -1064,7 +1064,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
if( !sOut.isEmpty() )
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OSL_ENSURE( !bInCntnr, "Container wird fuer Controls nicht unterstuertzt" );
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) && !bInCntnr )
@@ -1202,7 +1202,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
lcl_html_outEvents( rWrt.Strm(), xFormComp, rHTMLWrt.bCfgStarBasic,
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
if( TAG_SELECT == eTag )
{
@@ -1264,7 +1264,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value).
append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), sVal,
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
@@ -1273,7 +1273,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_selected);
sOut.append('>');
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), pStrings[i],
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
@@ -1304,7 +1304,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
while ( nPos != -1 )
{
if( nPos )
- rWrt.Strm() << SAL_NEWLINE_STRING;
+ rWrt.Strm().WriteCharPtr( SAL_NEWLINE_STRING );
OUString aLine = sVal.getToken( 0, 0x0A, nPos );
HTMLOutFuncs::Out_String( rWrt.Strm(), aLine,
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
@@ -1320,12 +1320,12 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
sValue = *(OUString*)aTmp.getValue();
HTMLOutFuncs::Out_String( rWrt.Strm(), sValue,
- rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << ' ';
+ rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( ' ' );
}
}
if( !aEndTags.isEmpty() )
- rWrt.Strm() << aEndTags.getStr();
+ rWrt.Strm().WriteCharPtr( aEndTags.getStr() );
// Controls sind nicht absatz-gebunden, deshalb kein LF mehr ausgeben!
rHTMLWrt.bLFPossible = sal_False;
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 43e8672586dc..28cafb85bcc4 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -412,7 +412,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
}
}
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rWrt.bTxtAttr = sal_False;
rWrt.bOutOpts = sal_True;
@@ -458,7 +458,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
&rWrt.aNonConvertableCharacters));
}
sOut.append('>');
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rWrt.bLFPossible = sal_True;
rWrt.IncIndentLevel(); // den Inhalt von <TD>...</TD> einruecken
@@ -532,7 +532,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
}
rWrt.OutNewLine(); // <TR> in neuer Zeile
- rWrt.Strm() << '<' << OOO_STRING_SVTOOLS_HTML_tablerow;
+ rWrt.Strm().WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tablerow );
if( pBrushItem )
{
rWrt.OutBackground( pBrushItem, sal_False );
@@ -549,10 +549,10 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_valign)
.append("=\"").append(text::VertOrientation::TOP==eRowVertOri ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom)
.append("\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
}
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
rWrt.IncIndentLevel(); // Inhalt von <TR>...</TR> einruecken
@@ -638,7 +638,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
rWrt.nDirection = rWrt.GetHTMLDirection( pFrmFmt->GetAttrSet() );
if( rWrt.bOutFlyFrame || nOldDirection != rWrt.nDirection )
{
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rWrt.OutDirection( rWrt.nDirection );
}
@@ -714,7 +714,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_cellspacing).
append("=\"").append(static_cast<sal_Int32>(rWrt.ToPixel(nCellSpacing,false))).append("\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// Hintergrund ausgeben
if( pFrmFmt )
@@ -726,7 +726,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
}
sOut.append('>');
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rWrt.IncIndentLevel(); // Inhalte von Table einruecken
@@ -787,7 +787,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
else
sOutStr.append(static_cast<sal_Int32>(rWrt.ToPixel(nWidth,false)));
sOutStr.append("\">");
- rWrt.Strm() << sOutStr.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOutStr.makeStringAndClear().getStr() );
if( bColGroups && pColumn->bRightBorder && nCol<nCols-1 )
{
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index e3ff3c7f08ea..e84dca5d6587 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -338,7 +338,7 @@ sal_uLong SwHTMLWriter::WriteStream()
OutHiddenForms();
if( !aStartTags.isEmpty() )
- Strm() << aStartTags.getStr();
+ Strm().WriteCharPtr( aStartTags.getStr() );
const SfxPoolItem *pItem;
const SfxItemSet& rPageItemSet = pCurrPageDesc->GetMaster().GetAttrSet();
@@ -526,20 +526,20 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id).
append("=\"");
- rHTMLWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
sal_uInt16 nDir = rHTMLWrt.GetHTMLDirection( rFmt.GetAttrSet() );
- rHTMLWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rHTMLWrt.OutDirection( nDir );
if( FILE_LINK_SECTION == rSection.GetType() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_href).
append("=\"");
- rHTMLWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
const OUString& aFName = rSection.GetLinkFileName();
OUString aURL( aFName.getToken(0,sfx2::cTokenSeparator) );
@@ -555,12 +555,12 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
&rHTMLWrt.aNonConvertableCharacters );
const sal_Char *pDelim = "&#255;";
if( !aFilter.isEmpty() || !aSection.isEmpty() || bURLContainsDelim )
- rHTMLWrt.Strm() << pDelim;
+ rHTMLWrt.Strm().WriteCharPtr( pDelim );
if( !aFilter.isEmpty() )
HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aFilter,
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
if( !aSection.isEmpty() || bURLContainsDelim )
- rHTMLWrt.Strm() << pDelim;
+ rHTMLWrt.Strm().WriteCharPtr( pDelim );
if( !aSection.isEmpty() )
{
sal_Int32 nPos = aSection.indexOf( '%' );
@@ -597,11 +597,11 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
}
}
- rHTMLWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
if( rHTMLWrt.IsHTMLMode( rHTMLWrt.bCfgOutStyles ) )
rHTMLWrt.OutCSS1_SectionFmtOptions( rFmt, pCol );
- rHTMLWrt.Strm() << '>';
+ rHTMLWrt.Strm().WriteChar( '>' );
rHTMLWrt.bLFPossible = sal_True;
if( !rName.isEmpty() && !bContinued )
@@ -836,7 +836,7 @@ static void OutBodyColor( const sal_Char *pTag, const SwFmt *pFmt,
{
OStringBuffer sOut;
sOut.append(' ').append(pTag).append("=");
- rHWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rHWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
Color aColor( pColorItem->GetValue() );
if( COL_AUTO == aColor.GetColor() )
aColor.SetColor( COL_BLACK );
@@ -973,7 +973,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
// der Body wird nicht eingerueckt, weil sonst alles eingerueckt waere!
OutNewLine();
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_body);
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// language
OutLanguage( eLang );
@@ -1006,7 +1006,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
if( pDoc->GetDocShell() ) // nur mit DocShell ist Basic moeglich
OutBasicBodyEvents();
- Strm() << '>';
+ Strm().WriteChar( '>' );
return pPageDesc;
}
@@ -1016,8 +1016,8 @@ void SwHTMLWriter::OutAnchor( const OUString& rName )
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
- HTMLOutFuncs::Out_String( Strm(), rName, eDestEnc, &aNonConvertableCharacters ) << "\">";
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+ HTMLOutFuncs::Out_String( Strm(), rName, eDestEnc, &aNonConvertableCharacters ).WriteCharPtr( "\">" );
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False );
}
@@ -1114,7 +1114,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, sal_Bool bGrap
{
OStringBuffer sOut;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append('=');
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_Color( Strm(), rBackColor, eDestEnc);
}
@@ -1130,9 +1130,9 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, sal_Bool bGrap
{
nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
}
- Strm() << " " OOO_STRING_SVTOOLS_HTML_O_background "=\"";
- Strm() << OOO_STRING_SVTOOLS_HTML_O_data ":";
- HTMLOutFuncs::Out_String( Strm(), aGraphicInBase64, eDestEnc, &aNonConvertableCharacters ) << '\"';
+ Strm().WriteCharPtr( " " OOO_STRING_SVTOOLS_HTML_O_background "=\"" );
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_data ":" );
+ HTMLOutFuncs::Out_String( Strm(), aGraphicInBase64, eDestEnc, &aNonConvertableCharacters ).WriteChar( '\"' );
}
}
@@ -1171,9 +1171,9 @@ void SwHTMLWriter::OutLanguage( LanguageType nLang )
OStringBuffer sOut;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_lang)
.append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), LanguageTag::convertToBcp47(nLang),
- eDestEnc, &aNonConvertableCharacters ) << '"';
+ eDestEnc, &aNonConvertableCharacters ).WriteChar( '"' );
}
}
@@ -1220,7 +1220,7 @@ void SwHTMLWriter::OutDirection( sal_uInt16 nDir )
OStringBuffer sOut;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_dir)
.append("=\"").append(pValue).append('\"');
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
}
}
@@ -1245,14 +1245,14 @@ void SwHTMLWriter::OutNewLine( sal_Bool bCheck )
{
if( !bCheck || (Strm().Tell()-nLastLFPos) > nIndentLvl )
{
- Strm() << SAL_NEWLINE_STRING;
+ Strm().WriteCharPtr( SAL_NEWLINE_STRING );
nLastLFPos = Strm().Tell();
}
if( nIndentLvl && nIndentLvl <= MAX_INDENT_LEVEL)
{
sIndentTabs[nIndentLvl] = 0;
- Strm() << sIndentTabs;
+ Strm().WriteCharPtr( sIndentTabs );
sIndentTabs[nIndentLvl] = '\t';
}
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 834c642a5128..beeb4db626b0 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -338,7 +338,7 @@ void RtfAttributeOutput::EmptyParagraph()
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << SAL_NEWLINE_STRING << OOO_STRING_SVTOOLS_RTF_PAR << ' ';
+ m_rExport.Strm().WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAR ).WriteChar( ' ' );
}
void RtfAttributeOutput::SectionBreaks(const SwTxtNode& rNode)
@@ -348,12 +348,12 @@ void RtfAttributeOutput::SectionBreaks(const SwTxtNode& rNode)
// output page/section breaks
SwNodeIndex aNextIndex( rNode, 1 );
- m_rExport.Strm() << m_aSectionBreaks.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( m_aSectionBreaks.makeStringAndClear().getStr() );
m_bBufferSectionBreaks = true;
// output section headers / footers
if (!m_bBufferSectionHeaders)
- m_rExport.Strm() << m_aSectionHeaders.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( m_aSectionHeaders.makeStringAndClear().getStr() );
if ( aNextIndex.GetNode().IsTxtNode() )
{
@@ -383,7 +383,7 @@ void RtfAttributeOutput::StartParagraphProperties()
aPar.append(' ');
}
if (!m_bBufferSectionHeaders)
- m_rExport.Strm() << aPar.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( aPar.makeStringAndClear().getStr() );
else
m_aSectionHeaders.append(aPar.makeStringAndClear());
}
@@ -392,7 +392,7 @@ void RtfAttributeOutput::EndParagraphProperties( const boost::shared_ptr<SfxItem
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(m_aStylesEnd.makeStringAndClear());
- m_rExport.Strm() << m_aStyles.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( m_aStyles.makeStringAndClear().getStr() );
}
void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun )
@@ -554,7 +554,7 @@ void RtfAttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
if (pStyle)
aStyle.append(pStyle->getStr());
if (!m_bBufferSectionHeaders)
- m_rExport.Strm() << aStyle.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( aStyle.makeStringAndClear().getStr() );
else
m_aSectionHeaders.append(aStyle.makeStringAndClear());
}
@@ -928,8 +928,8 @@ void RtfAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pT
return;
// Empty the previous row closing buffer before starting the new one,
// necessary for subtables.
- m_rExport.Strm() << m_aAfterRuns.makeStringAndClear().getStr();
- m_rExport.Strm() << m_aRowDefs.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( m_aAfterRuns.makeStringAndClear().getStr() );
+ m_rExport.Strm().WriteCharPtr( m_aRowDefs.makeStringAndClear().getStr() );
}
void RtfAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
@@ -1048,7 +1048,7 @@ void RtfAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer
void RtfAttributeOutput::StartStyles()
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << SAL_NEWLINE_STRING << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL;
+ m_rExport.Strm().WriteCharPtr( SAL_NEWLINE_STRING ).WriteChar( '{' ).WriteCharPtr( 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);
@@ -1059,9 +1059,9 @@ void RtfAttributeOutput::StartStyles()
void RtfAttributeOutput::EndStyles( sal_uInt16 /*nNumberOfStyles*/ )
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << '}';
- m_rExport.Strm() << m_aStylesheet.makeStringAndClear().getStr();
- m_rExport.Strm() << '}';
+ m_rExport.Strm().WriteChar( '}' );
+ m_rExport.Strm().WriteCharPtr( m_aStylesheet.makeStringAndClear().getStr() );
+ m_rExport.Strm().WriteChar( '}' );
}
void RtfAttributeOutput::DefaultStyle( sal_uInt16 /*nStyle*/ )
@@ -1141,7 +1141,7 @@ void RtfAttributeOutput::PageBreakBefore( bool bBreak )
if (bBreak)
{
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_PAGEBB;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAGEBB );
}
}
@@ -1167,7 +1167,7 @@ void RtfAttributeOutput::StartSection()
m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_SECT OOO_STRING_SVTOOLS_RTF_SECTD);
if (!m_bBufferSectionBreaks)
- m_rExport.Strm() << m_aSectionBreaks.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( m_aSectionBreaks.makeStringAndClear().getStr() );
}
void RtfAttributeOutput::EndSection()
@@ -1192,12 +1192,12 @@ void RtfAttributeOutput::SectionLineNumbering( sal_uLong /*nRestartNo*/, const S
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LINEMOD;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LINEMOD );
m_rExport.OutLong(rLnNumInfo.GetCountBy());
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LINEX;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LINEX );
m_rExport.OutLong(rLnNumInfo.GetPosFromLeft());
if (!rLnNumInfo.IsRestartEachPage())
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LINECONT;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LINECONT );
}
void RtfAttributeOutput::SectionTitlePage()
@@ -1240,7 +1240,7 @@ void RtfAttributeOutput::SectionBiDi( bool bBiDi )
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << (bBiDi ? OOO_STRING_SVTOOLS_RTF_RTLSECT : OOO_STRING_SVTOOLS_RTF_LTRSECT);
+ m_rExport.Strm().WriteCharPtr( (bBiDi ? OOO_STRING_SVTOOLS_RTF_RTLSECT : OOO_STRING_SVTOOLS_RTF_LTRSECT) );
}
void RtfAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, ::boost::optional<sal_uInt16> oPageRestartNumber )
@@ -1289,26 +1289,26 @@ void RtfAttributeOutput::SectionType( sal_uInt8 nBreakCode )
}
m_aSectionBreaks.append(sType);
if (!m_bBufferSectionBreaks)
- m_rExport.Strm() << m_aSectionBreaks.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( m_aSectionBreaks.makeStringAndClear().getStr() );
}
void RtfAttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &/*rRule*/ )
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE;
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LISTID;
+ m_rExport.Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE );
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LISTID );
m_rExport.OutULong(nId);
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT << '0';
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LS;
- 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.OutULong(nId).WriteChar( '}' );
}
void RtfAttributeOutput::StartAbstractNumbering( sal_uInt16 nId )
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LIST << OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID;
+ m_rExport.Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LIST ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID );
m_rExport.OutULong( nId );
m_nListId = nId;
}
@@ -1317,8 +1317,8 @@ void RtfAttributeOutput::EndAbstractNumbering()
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LISTID;
- m_rExport.OutULong( m_nListId ) << '}' << SAL_NEWLINE_STRING;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LISTID );
+ m_rExport.OutULong( m_nListId ).WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
}
void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
@@ -1337,11 +1337,11 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << SAL_NEWLINE_STRING;
+ m_rExport.Strm().WriteCharPtr( SAL_NEWLINE_STRING );
if( nLevel > 8 ) // RTF knows only 9 levels
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_SOUTLVL;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SOUTLVL );
- m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTLEVEL;
+ m_rExport.Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LISTLEVEL );
sal_uInt16 nVal = 0;
switch( nNumberingType )
@@ -1357,7 +1357,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
case SVX_NUM_CHAR_SPECIAL: nVal = 23; break;
case SVX_NUM_NUMBER_NONE: nVal = 255; break;
}
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LEVELNFC;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LEVELNFC );
m_rExport.OutULong( nVal );
switch( eAdjust )
@@ -1366,7 +1366,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
case SVX_ADJUST_RIGHT: nVal = 2; break;
default: nVal = 0; break;
}
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LEVELJC;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LEVELJC );
m_rExport.OutULong( nVal );
// bullet
@@ -1375,63 +1375,63 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
int nIndex = m_rExport.GetGrfIndex(*pBrush);
if (nIndex != -1)
{
- m_rExport.Strm() << LO_STRING_SVTOOLS_RTF_LEVELPICTURE;
+ m_rExport.Strm().WriteCharPtr( LO_STRING_SVTOOLS_RTF_LEVELPICTURE );
m_rExport.OutULong(nIndex);
}
}
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT );
m_rExport.OutULong( nStart );
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW );
m_rExport.OutULong( nFollow );
// leveltext group
- m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LEVELTEXT << ' ';
+ m_rExport.Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LEVELTEXT ).WriteChar( ' ' );
if( SVX_NUM_CHAR_SPECIAL == nNumberingType ||
SVX_NUM_BITMAP == nNumberingType )
{
- m_rExport.Strm() << "\\'01";
+ m_rExport.Strm().WriteCharPtr( "\\'01" );
sal_Unicode cChar = rNumberingString[0];
- m_rExport.Strm() << "\\u";
+ m_rExport.Strm().WriteCharPtr( "\\u" );
m_rExport.OutULong(cChar);
- m_rExport.Strm() << " ?";
+ m_rExport.Strm().WriteCharPtr( " ?" );
}
else
{
- m_rExport.Strm() << "\\'" << msfilter::rtfutil::OutHex( rNumberingString.getLength(), 2 ).getStr();
- m_rExport.Strm() << msfilter::rtfutil::OutString( rNumberingString, m_rExport.eDefaultEncoding, /*bUnicode =*/ false ).getStr();
+ m_rExport.Strm().WriteCharPtr( "\\'" ).WriteCharPtr( msfilter::rtfutil::OutHex( rNumberingString.getLength(), 2 ).getStr() );
+ m_rExport.Strm().WriteCharPtr( msfilter::rtfutil::OutString( rNumberingString, m_rExport.eDefaultEncoding, /*bUnicode =*/ false ).getStr() );
}
- m_rExport.Strm() << ";}";
+ m_rExport.Strm().WriteCharPtr( ";}" );
// write the levelnumbers
- m_rExport.Strm() << "{" << OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS;
+ m_rExport.Strm().WriteCharPtr( "{" ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS );
for( sal_uInt8 i = 0; i <= nLevel && pNumLvlPos[ i ]; ++i )
{
- m_rExport.Strm() << "\\'" << msfilter::rtfutil::OutHex(pNumLvlPos[ i ], 2).getStr();
+ m_rExport.Strm().WriteCharPtr( "\\'" ).WriteCharPtr( msfilter::rtfutil::OutHex(pNumLvlPos[ i ], 2).getStr() );
}
- m_rExport.Strm() << ";}";
+ m_rExport.Strm().WriteCharPtr( ";}" );
if( pOutSet )
{
if (pFont)
{
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_F;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_F );
m_rExport.OutULong(m_rExport.maFontHelper.GetId(*pFont));
}
m_rExport.OutputItemSet( *pOutSet, false, true, i18n::ScriptType::LATIN, m_rExport.mbExportModeRTF );
- m_rExport.Strm() << m_aStyles.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( m_aStyles.makeStringAndClear().getStr() );
}
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_FI;
- m_rExport.OutLong( nFirstLineIndex ) << OOO_STRING_SVTOOLS_RTF_LI;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FI );
+ m_rExport.OutLong( nFirstLineIndex ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LI );
m_rExport.OutLong( nIndentAt );
- m_rExport.Strm() << '}';
+ m_rExport.Strm().WriteChar( '}' );
if( nLevel > 8 )
- m_rExport.Strm() << '}';
+ m_rExport.Strm().WriteChar( '}' );
}
void RtfAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField /*eType*/, const OUString& rFldCmd, sal_uInt8 /*nMode*/ )
@@ -1582,8 +1582,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
OSL_ENSURE(m_aRunText.getLength() == 0, "m_aRunText is not empty");
m_rExport.mpParentFrame = &rFrame;
- m_rExport.Strm() << "{" OOO_STRING_SVTOOLS_RTF_SHP;
- m_rExport.Strm() << "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPINST;
+ m_rExport.Strm().WriteCharPtr( "{" OOO_STRING_SVTOOLS_RTF_SHP );
+ m_rExport.Strm().WriteCharPtr( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPINST );
// Shape properties.
m_aFlyProperties.push_back(std::make_pair<OString, OString>("shapeType", OString::number(ESCHER_ShpInst_TextBox)));
@@ -1595,8 +1595,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
m_rExport.bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = true;
m_rExport.OutputFormat( rFrame.GetFrmFmt(), false, false, true );
- m_rExport.Strm() << m_aRunText.makeStringAndClear().getStr();
- m_rExport.Strm() << m_aStyles.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( m_aRunText.makeStringAndClear().getStr() );
+ m_rExport.Strm().WriteCharPtr( m_aStyles.makeStringAndClear().getStr() );
m_rExport.bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = false;
m_pFlyFrameSize = 0;
@@ -1605,16 +1605,16 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
for (size_t i = 0; i < m_aFlyProperties.size(); ++i)
{
- m_rExport.Strm() << "{" OOO_STRING_SVTOOLS_RTF_SP "{";
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_SN " ";
- m_rExport.Strm() << m_aFlyProperties[i].first.getStr();
- m_rExport.Strm() << "}{" OOO_STRING_SVTOOLS_RTF_SV " ";
- m_rExport.Strm() << m_aFlyProperties[i].second.getStr();
- m_rExport.Strm() << "}}";
+ m_rExport.Strm().WriteCharPtr( "{" OOO_STRING_SVTOOLS_RTF_SP "{" );
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SN " " );
+ m_rExport.Strm().WriteCharPtr( m_aFlyProperties[i].first.getStr() );
+ m_rExport.Strm().WriteCharPtr( "}{" OOO_STRING_SVTOOLS_RTF_SV " " );
+ m_rExport.Strm().WriteCharPtr( m_aFlyProperties[i].second.getStr() );
+ m_rExport.Strm().WriteCharPtr( "}}" );
}
m_aFlyProperties.clear();
- m_rExport.Strm() << "{" OOO_STRING_SVTOOLS_RTF_SHPTXT;
+ m_rExport.Strm().WriteCharPtr( "{" OOO_STRING_SVTOOLS_RTF_SHPTXT );
{
/*
@@ -1638,7 +1638,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
m_rExport.WriteText( );
m_rExport.RestoreData();
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_PARD;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD );
m_rExport.bRTFFlySyntax = false;
m_aRun->append(aSave);
m_aRunText.clear();
@@ -1648,11 +1648,11 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
m_rExport.mpParentFrame = NULL;
- m_rExport.Strm() << '}'; // shptxt
- m_rExport.Strm() << '}'; // shpinst
- m_rExport.Strm() << '}'; // shp
+ m_rExport.Strm().WriteChar( '}' ); // shptxt
+ m_rExport.Strm().WriteChar( '}' ); // shpinst
+ m_rExport.Strm().WriteChar( '}' ); // shp
- m_rExport.Strm() << SAL_NEWLINE_STRING;
+ m_rExport.Strm().WriteCharPtr( SAL_NEWLINE_STRING );
}
break;
case sw::Frame::eGraphic:
@@ -2749,7 +2749,7 @@ void RtfAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGHSXN);
m_aSectionBreaks.append((sal_Int32)rSize.GetHeight());
if (!m_bBufferSectionBreaks)
- m_rExport.Strm() << m_aSectionBreaks.makeStringAndClear().getStr();
+ m_rExport.Strm().WriteCharPtr( m_aSectionBreaks.makeStringAndClear().getStr() );
}
}
@@ -2777,8 +2777,7 @@ void RtfAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
m_aSectionBreaks.append((sal_Int32)rLRSpace.GetRight());
}
if (!m_bBufferSectionBreaks)
- m_rExport.Strm() <<
- m_aSectionBreaks.makeStringAndClear().getStr();
+ m_rExport.Strm(). WriteCharPtr( m_aSectionBreaks.makeStringAndClear().getStr() );
}
else
{
@@ -2838,8 +2837,7 @@ void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrBottom);
}
if (!m_bBufferSectionBreaks)
- m_rExport.Strm() <<
- m_aSectionBreaks.makeStringAndClear().getStr();
+ m_rExport.Strm(). WriteCharPtr( m_aSectionBreaks.makeStringAndClear().getStr() );
}
else
{
@@ -2888,7 +2886,7 @@ void RtfAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert
break;
default:
m_aFlyProperties.push_back(std::make_pair<OString, OString>("posrelv", OString::number(2)));
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_SHPBYPARA << OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHPBYPARA ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE );
break;
}
@@ -2910,11 +2908,11 @@ void RtfAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert
break;
}
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_SHPTOP;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHPTOP );
m_rExport.OutLong(rFlyVert.GetPos());
if (m_pFlyFrameSize)
{
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_SHPBOTTOM;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHPBOTTOM );
m_rExport.OutLong(rFlyVert.GetPos() + m_pFlyFrameSize->Height());
}
}
@@ -2933,7 +2931,7 @@ void RtfAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori
break;
default:
m_aFlyProperties.push_back(std::make_pair<OString, OString>("posrelh", OString::number(2)));
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN << OOO_STRING_SVTOOLS_RTF_SHPBXIGNORE;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHPBXIGNORE );
break;
}
@@ -2952,11 +2950,11 @@ void RtfAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori
break;
}
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_SHPLEFT;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHPLEFT );
m_rExport.OutLong(rFlyHori.GetPos());
if (m_pFlyFrameSize)
{
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_SHPRIGHT;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SHPRIGHT );
m_rExport.OutLong(rFlyHori.GetPos() + m_pFlyFrameSize->Width());
}
}
@@ -3110,12 +3108,12 @@ void RtfAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& r
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_COLS;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLS );
m_rExport.OutLong( nCols );
if( bEven )
{
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_COLSX;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLSX );
m_rExport.OutLong( rCol.GetGutterWidth( sal_True ) );
}
else
@@ -3123,15 +3121,15 @@ void RtfAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& r
const SwColumns & rColumns = rCol.GetColumns( );
for( sal_uInt16 n = 0; n < nCols; )
{
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_COLNO;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLNO );
m_rExport.OutLong( n+1 );
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_COLW;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLW );
m_rExport.OutLong( rCol.CalcPrtColWidth( n, nPageSize ) );
if( ++n != nCols )
{
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_COLSR;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLSR );
m_rExport.OutLong( rColumns[ n-1 ].GetRight() +
rColumns[ n ].GetLeft() );
}
@@ -3315,7 +3313,7 @@ void RtfAttributeOutput::StartFont( const OUString& rFamilyName ) const
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << OUStringToOString( rFamilyName, m_rExport.eCurrentEncoding ).getStr();
+ m_rExport.Strm().WriteCharPtr( OUStringToOString( rFamilyName, m_rExport.eCurrentEncoding ).getStr() );
}
/// End the font.
@@ -3323,7 +3321,7 @@ void RtfAttributeOutput::EndFont() const
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << ";}";
+ m_rExport.Strm().WriteCharPtr( ";}" );
}
/// Alternate name for the font.
@@ -3331,8 +3329,8 @@ void RtfAttributeOutput::FontAlternateName( const OUString& rName ) const
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_FALT << ' ';
- m_rExport.Strm() << OUStringToOString( rName, m_rExport.eCurrentEncoding ).getStr() << '}';
+ m_rExport.Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FALT ).WriteChar( ' ' );
+ m_rExport.Strm().WriteCharPtr( OUStringToOString( rName, m_rExport.eCurrentEncoding ).getStr() ).WriteChar( '}' );
}
/// Font charset.
@@ -3340,9 +3338,9 @@ void RtfAttributeOutput::FontCharset( sal_uInt8 nCharSet ) const
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_FCHARSET;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FCHARSET );
m_rExport.OutULong( nCharSet );
- m_rExport.Strm() << ' ';
+ m_rExport.Strm().WriteChar( ' ' );
}
/// Font family.
@@ -3350,7 +3348,7 @@ void RtfAttributeOutput::FontFamilyType( FontFamily eFamily, const wwFont &rFont
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_F;
+ m_rExport.Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_F );
const char* pStr = OOO_STRING_SVTOOLS_RTF_FNIL;
switch (eFamily)
@@ -3373,7 +3371,7 @@ void RtfAttributeOutput::FontFamilyType( FontFamily eFamily, const wwFont &rFont
default:
break;
}
- m_rExport.OutULong(m_rExport.maFontHelper.GetId(rFont)) << pStr;
+ m_rExport.OutULong(m_rExport.maFontHelper.GetId(rFont)).WriteCharPtr( pStr );
}
/// Font pitch.
@@ -3381,7 +3379,7 @@ void RtfAttributeOutput::FontPitchType( FontPitch ePitch ) const
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_FPRQ;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FPRQ );
sal_uInt16 nVal = 0;
switch (ePitch)
@@ -3443,18 +3441,18 @@ OString RtfAttributeOutput::WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, S
if (sNo.getLength() < 2)
{
if (pStream)
- (*pStream) << '0';
+ pStream->WriteChar( '0' );
else
aRet.append('0');
}
if (pStream)
- (*pStream) << sNo.getStr();
+ pStream->WriteCharPtr( sNo.getStr() );
else
aRet.append(sNo);
if (++nBreak == nLimit)
{
if (pStream)
- (*pStream) << SAL_NEWLINE_STRING;
+ pStream->WriteCharPtr( SAL_NEWLINE_STRING );
else
aRet.append(SAL_NEWLINE_STRING);
nBreak = 0;
@@ -3543,14 +3541,14 @@ static OString ExportPICT( const SwFlyFrmFmt* pFlyFrmFmt, const Size &rOrig, con
}
aRet.append(SAL_NEWLINE_STRING);
if (pStream)
- (*pStream) << aRet.makeStringAndClear().getStr();
+ pStream->WriteCharPtr( aRet.makeStringAndClear().getStr() );
if (pStream)
RtfAttributeOutput::WriteHex(pGraphicAry, nSize, pStream);
else
aRet.append(RtfAttributeOutput::WriteHex(pGraphicAry, nSize));
aRet.append('}');
if (pStream)
- (*pStream) << aRet.makeStringAndClear().getStr();
+ pStream->WriteCharPtr( aRet.makeStringAndClear().getStr() );
}
return aRet.makeStringAndClear();
}
@@ -3704,7 +3702,7 @@ void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const S
*/
bool bIsWMF = pBLIPType && std::strcmp(pBLIPType, OOO_STRING_SVTOOLS_RTF_WMETAFILE) == 0;
if (!bIsWMF)
- m_rExport.Strm() << "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPPICT;
+ m_rExport.Strm().WriteCharPtr( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPPICT );
if (pBLIPType)
ExportPICT( pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport, &m_rExport.Strm() );
@@ -3722,7 +3720,7 @@ void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const S
if (!bIsWMF)
{
- m_rExport.Strm() << "}" "{" OOO_STRING_SVTOOLS_RTF_NONSHPPICT;
+ m_rExport.Strm().WriteCharPtr( "}" "{" OOO_STRING_SVTOOLS_RTF_NONSHPPICT );
aStream.Seek(0);
GraphicConverter::Export(aStream, aGraphic, CVT_WMF);
@@ -3733,23 +3731,23 @@ void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const S
ExportPICT(pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport, &m_rExport.Strm() );
- m_rExport.Strm() << '}';
+ m_rExport.Strm().WriteChar( '}' );
}
- m_rExport.Strm() << SAL_NEWLINE_STRING;
+ m_rExport.Strm().WriteCharPtr( SAL_NEWLINE_STRING );
}
void RtfAttributeOutput::BulletDefinition(int /*nId*/, const Graphic& rGraphic, Size aSize)
{
- m_rExport.Strm() << "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPPICT;
- m_rExport.Strm() << "{" OOO_STRING_SVTOOLS_RTF_PICT OOO_STRING_SVTOOLS_RTF_PNGBLIP;
+ 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() << OOO_STRING_SVTOOLS_RTF_PICWGOAL;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PICWGOAL );
m_rExport.OutULong(aSize.Width());
- m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_PICHGOAL;
+ m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PICHGOAL );
m_rExport.OutULong(aSize.Height());
- m_rExport.Strm() << SAL_NEWLINE_STRING;
+ m_rExport.Strm().WriteCharPtr( SAL_NEWLINE_STRING );
const sal_uInt8* pGraphicAry = 0;
SvMemoryStream aStream;
if (GraphicConverter::Export(aStream, rGraphic, CVT_PNG) != ERRCODE_NONE)
@@ -3758,7 +3756,7 @@ void RtfAttributeOutput::BulletDefinition(int /*nId*/, const Graphic& rGraphic,
sal_uInt32 nSize = aStream.Tell();
pGraphicAry = (sal_uInt8*)aStream.GetData();
RtfAttributeOutput::WriteHex(pGraphicAry, nSize, &m_rExport.Strm());
- m_rExport.Strm() << "}}"; // pict, shppict
+ m_rExport.Strm().WriteCharPtr( "}}" ); // pict, shppict
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 220442ea0ae7..af06f82c0569 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -254,21 +254,21 @@ void RtfExport::WriteNumbering()
if ( !pUsedNumTbl )
return; // no numbering is used
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_LISTTABLE;
+ Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LISTTABLE );
CollectGrfsOfBullets();
if (!m_vecBulletPic.empty())
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << LO_STRING_SVTOOLS_RTF_LISTPICTURE;
+ Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( LO_STRING_SVTOOLS_RTF_LISTPICTURE );
BulletDefinitions();
if (!m_vecBulletPic.empty())
- Strm() << '}';
+ Strm().WriteChar( '}' );
AbstractNumberingDefinitions();
- Strm() << '}';
+ Strm().WriteChar( '}' );
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE;
+ Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE );
NumberingDefinitions();
- Strm() << '}';
+ Strm().WriteChar( '}' );
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end");
}
@@ -293,16 +293,16 @@ void RtfExport::WriteRevTab()
}
// Now write the table
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_REVTBL << ' ';
+ Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_REVTBL ).WriteChar( ' ' );
for(sal_uInt16 i = 0; i < m_aRedlineTbl.size(); ++i)
{
const OUString* pAuthor = GetRedline(i);
- Strm() << '{';
+ Strm().WriteChar( '{' );
if (pAuthor)
- Strm() << msfilter::rtfutil::OutString(*pAuthor, eDefaultEncoding).getStr();
- Strm() << ";}";
+ Strm().WriteCharPtr( msfilter::rtfutil::OutString(*pAuthor, eDefaultEncoding).getStr() );
+ Strm().WriteCharPtr( ";}" );
}
- Strm() << '}' << SAL_NEWLINE_STRING;
+ Strm().WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
}
void RtfExport::WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
@@ -398,9 +398,9 @@ sal_uLong RtfExport::ReplaceCr( sal_uInt8 )
void RtfExport::WriteFonts()
{
- Strm() << SAL_NEWLINE_STRING << '{' << OOO_STRING_SVTOOLS_RTF_FONTTBL;
+ Strm().WriteCharPtr( SAL_NEWLINE_STRING ).WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FONTTBL );
maFontHelper.WriteFontTable( *m_pAttrOutput );
- Strm() << '}';
+ Strm().WriteChar( '}' );
}
void RtfExport::WriteStyles()
@@ -416,10 +416,10 @@ void RtfExport::WriteFootnoteSettings()
// Request a separator only in case the width is larger than zero.
bool bSeparator = double(rFtnInfo.GetWidth()) > 0;
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_FTNSEP;
+ Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FTNSEP );
if (bSeparator)
- Strm() << OOO_STRING_SVTOOLS_RTF_CHFTNSEP;
- Strm() << '}';
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CHFTNSEP );
+ Strm().WriteChar( '}' );
}
void RtfExport::WriteMainText()
@@ -446,7 +446,7 @@ void RtfExport::WriteMainText()
void RtfExport::WriteInfo()
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_INFO;
+ Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INFO );
SwDocShell *pDocShell(pDoc->GetDocShell());
uno::Reference<document::XDocumentProperties> xDocProps;
@@ -474,8 +474,8 @@ void RtfExport::WriteInfo()
OutDateTime(OOO_STRING_SVTOOLS_RTF_PRINTIM, xDocProps->getPrintDate());
}
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_COMMENT << " ";
- Strm() << OUStringToOString( utl::ConfigManager::getProductName(), eCurrentEncoding).getStr() << "}{" << OOO_STRING_SVTOOLS_RTF_VERN;
+ Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COMMENT ).WriteCharPtr( " " );
+ Strm().WriteCharPtr( OUStringToOString( utl::ConfigManager::getProductName(), eCurrentEncoding).getStr() ).WriteCharPtr( "}{" ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_VERN );
// The convention that we follow is that the version number
// should be a non-negative 32-bit int
@@ -485,8 +485,8 @@ void RtfExport::WriteInfo()
#error Minor, micro and patchlevel version numbers must be less than 256
#endif
- Strm().WriteNumber((sal_Int32) LIBO_VERSION_ENCODED_IN_32BITS) << '}';
- Strm() << '}';
+ Strm().WriteNumber((sal_Int32) LIBO_VERSION_ENCODED_IN_32BITS).WriteChar( '}' );
+ Strm().WriteChar( '}' );
}
void RtfExport::WritePageDescTable()
@@ -498,15 +498,15 @@ void RtfExport::WritePageDescTable()
if( !nSize )
return;
- Strm() << SAL_NEWLINE_STRING;
+ Strm().WriteCharPtr( SAL_NEWLINE_STRING );
bOutPageDescs = sal_True;
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_PGDSCTBL;
+ Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PGDSCTBL );
for( sal_uInt16 n = 0; n < nSize; ++n )
{
const SwPageDesc& rPageDesc = pDoc->GetPageDesc( n );
- Strm() << SAL_NEWLINE_STRING << '{' << OOO_STRING_SVTOOLS_RTF_PGDSC;
- OutULong( n ) << OOO_STRING_SVTOOLS_RTF_PGDSCUSE;
+ Strm().WriteCharPtr( SAL_NEWLINE_STRING ).WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PGDSC );
+ OutULong( n ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PGDSCUSE );
OutULong( rPageDesc.ReadUseOn() );
OutPageDescription( rPageDesc, false, false );
@@ -516,11 +516,11 @@ void RtfExport::WritePageDescTable()
while( i )
if( rPageDesc.GetFollow() == &pDoc->GetPageDesc( --i ) )
break;
- Strm() << OOO_STRING_SVTOOLS_RTF_PGDSCNXT;
- OutULong( i ) << ' ';
- Strm() << msfilter::rtfutil::OutString( rPageDesc.GetName(), eDefaultEncoding).getStr() << ";}";
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PGDSCNXT );
+ OutULong( i ).WriteChar( ' ' );
+ Strm().WriteCharPtr( msfilter::rtfutil::OutString( rPageDesc.GetName(), eDefaultEncoding).getStr() ).WriteCharPtr( ";}" );
}
- Strm() << '}' << SAL_NEWLINE_STRING;
+ Strm().WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
bOutPageDescs = sal_False;
// reset table infos, otherwise the depth of the cells will be incorrect,
@@ -531,13 +531,13 @@ void RtfExport::WritePageDescTable()
void RtfExport::ExportDocument_Impl()
{
// Make the header
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_RTF << '1'
- << OOO_STRING_SVTOOLS_RTF_ANSI;
- Strm() << OOO_STRING_SVTOOLS_RTF_DEFF;
+ Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF ).WriteChar( '1' )
+ .WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI );
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_DEFF );
OutULong( maFontHelper.GetId( (SvxFontItem&)pDoc->GetAttrPool().GetDefaultItem(
RES_CHRATR_FONT ) ));
// If this not exist, MS don't understand our ansi characters (0x80-0xff).
- Strm() << "\\adeflang1025";
+ Strm().WriteCharPtr( "\\adeflang1025" );
// Font table
WriteFonts();
@@ -554,17 +554,17 @@ void RtfExport::ExportDocument_Impl()
WriteInfo();
// Default TabSize
- Strm() << m_pAttrOutput->m_aTabStop.makeStringAndClear().getStr() << SAL_NEWLINE_STRING;
+ Strm().WriteCharPtr( m_pAttrOutput->m_aTabStop.makeStringAndClear().getStr() ).WriteCharPtr( SAL_NEWLINE_STRING );
// Zoom
SwViewShell *pViewShell(pDoc->GetCurrentViewShell());
if (pViewShell && pViewShell->GetViewOptions()->GetZoomType() == SVX_ZOOM_PERCENT)
{
- Strm() << OOO_STRING_SVTOOLS_RTF_VIEWSCALE;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_VIEWSCALE );
OutULong(pViewShell->GetViewOptions()->GetZoom());
}
// Record changes?
if (nsRedlineMode_t::REDLINE_ON & mnRedlineMode)
- Strm() << OOO_STRING_SVTOOLS_RTF_REVISIONS;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_REVISIONS );
// Init sections
m_pSections = new MSWordSections( *this );
@@ -583,14 +583,14 @@ void RtfExport::ExportDocument_Impl()
const SvxProtectItem* pProtect = (const SvxProtectItem*)rPool.GetItem2(RES_PROTECT, n);
if (pProtect && pProtect->IsCntntProtected())
{
- Strm() << OOO_STRING_SVTOOLS_RTF_FORMPROT;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FORMPROT );
break;
}
}
}
// enable form field shading
- Strm() << OOO_STRING_SVTOOLS_RTF_FORMSHADE;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FORMSHADE );
// size and empty margins of the page
if( pDoc->GetPageDescCnt() )
@@ -620,8 +620,8 @@ void RtfExport::ExportDocument_Impl()
else if( pDoc->FindPageDescByName( pSttPgDsc->
GetPageDesc()->GetName(), &nPosInDoc ))
{
- Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_PGDSCNO;
- OutULong( nPosInDoc ) << '}';
+ Strm().WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_IGNORE ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PGDSCNO );
+ OutULong( nPosInDoc ).WriteChar( '}' );
}
}
}
@@ -631,43 +631,43 @@ void RtfExport::ExportDocument_Impl()
{
if( rPageDesc.GetLandscape() )
- Strm() << OOO_STRING_SVTOOLS_RTF_LANDSCAPE;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LANDSCAPE );
const SwFmtFrmSize& rSz = rFmtPage.GetFrmSize();
// 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() << OOO_STRING_SVTOOLS_RTF_PAPERH;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAPERH );
Size a4 = SvxPaperInfo::GetPaperSize(PAPER_A4);
- OutULong( a4.Height() ) << OOO_STRING_SVTOOLS_RTF_PAPERW;
+ OutULong( a4.Height() ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAPERW );
OutULong( a4.Width() );
}
else
{
- Strm() << OOO_STRING_SVTOOLS_RTF_PAPERH;
- OutULong( rSz.GetHeight() ) << OOO_STRING_SVTOOLS_RTF_PAPERW;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAPERH );
+ OutULong( rSz.GetHeight() ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PAPERW );
OutULong( rSz.GetWidth() );
}
}
{
const SvxLRSpaceItem& rLR = rFmtPage.GetLRSpace();
- Strm() << OOO_STRING_SVTOOLS_RTF_MARGL;
- OutLong( rLR.GetLeft() ) << OOO_STRING_SVTOOLS_RTF_MARGR;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_MARGL );
+ OutLong( rLR.GetLeft() ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_MARGR );
OutLong( rLR.GetRight() );
}
{
const SvxULSpaceItem& rUL = rFmtPage.GetULSpace();
- Strm() << OOO_STRING_SVTOOLS_RTF_MARGT;
- OutLong( rUL.GetUpper() ) << OOO_STRING_SVTOOLS_RTF_MARGB;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_MARGT );
+ OutLong( rUL.GetUpper() ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_MARGB );
OutLong( rUL.GetLower() );
}
- Strm() << OOO_STRING_SVTOOLS_RTF_SECTD << OOO_STRING_SVTOOLS_RTF_SBKNONE;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SECTD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SBKNONE );
// All sections are unlocked by default
- Strm() << OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED );
OutLong(1);
OutPageDescription( rPageDesc, false, true ); // Changed bCheckForFirstPage to sal_True so headers
// following title page are correctly added - i13107
@@ -689,7 +689,7 @@ void RtfExport::ExportDocument_Impl()
const char* pOut = FTNPOS_CHAPTER == rFtnInfo.ePos
? OOO_STRING_SVTOOLS_RTF_ENDDOC
: OOO_STRING_SVTOOLS_RTF_FTNBJ;
- Strm() << pOut << OOO_STRING_SVTOOLS_RTF_FTNSTART;
+ Strm().WriteCharPtr( pOut ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FTNSTART );
OutLong( rFtnInfo.nFtnOffset + 1 );
switch( rFtnInfo.eNum )
@@ -698,7 +698,7 @@ void RtfExport::ExportDocument_Impl()
case FTNNUM_DOC: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTCONT; break;
default: pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART; break;
}
- Strm() << pOut;
+ Strm().WriteCharPtr( pOut );
switch( rFtnInfo.aFmt.GetNumberingType() )
{
@@ -711,13 +711,13 @@ void RtfExport::ExportDocument_Impl()
case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_FTNNCHI; break;
default: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR; break;
}
- Strm() << pOut;
+ Strm().WriteCharPtr( pOut );
const SwEndNoteInfo& rEndNoteInfo = pDoc->GetEndNoteInfo();
- Strm() << OOO_STRING_SVTOOLS_RTF_AENDDOC << OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT
- << OOO_STRING_SVTOOLS_RTF_AFTNSTART;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_AENDDOC ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT )
+ .WriteCharPtr( OOO_STRING_SVTOOLS_RTF_AFTNSTART );
OutLong( rEndNoteInfo.nFtnOffset + 1 );
switch( rEndNoteInfo.aFmt.GetNumberingType() )
@@ -731,16 +731,16 @@ void RtfExport::ExportDocument_Impl()
case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNCHI; break;
default: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR; break;
}
- Strm() << pOut;
+ Strm().WriteCharPtr( pOut );
}
- Strm() << SAL_NEWLINE_STRING;
+ Strm().WriteCharPtr( SAL_NEWLINE_STRING );
WriteFootnoteSettings();
WriteMainText();
- Strm() << '}';
+ Strm().WriteChar( '}' );
}
void RtfExport::PrepareNewPageDesc( const SfxItemSet* pSet,
@@ -776,7 +776,7 @@ bool RtfExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt )
if (((const SwTxtFmtColl*)pParent)->IsAssignedToListLevelOfOutlineStyle())
{
// Level 9 disables the outline
- Strm() << OOO_STRING_SVTOOLS_RTF_LEVEL << sal_Int32(9);
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LEVEL ).WriteInt32( sal_Int32(9) );
bRet = true;
}
@@ -877,23 +877,23 @@ void RtfExport::OutUnicode(const sal_Char *pToken, const OUString &rContent, boo
{
if (!bUpr)
{
- Strm() << '{' << pToken << ' ';
- Strm() << msfilter::rtfutil::OutString( rContent, eCurrentEncoding ).getStr();
- Strm() << '}';
+ Strm().WriteChar( '{' ).WriteCharPtr( pToken ).WriteChar( ' ' );
+ Strm().WriteCharPtr( msfilter::rtfutil::OutString( rContent, eCurrentEncoding ).getStr() );
+ Strm().WriteChar( '}' );
}
else
- Strm() << msfilter::rtfutil::OutStringUpr(pToken, rContent, eCurrentEncoding).getStr();
+ Strm().WriteCharPtr( msfilter::rtfutil::OutStringUpr(pToken, rContent, eCurrentEncoding).getStr() );
}
}
void RtfExport::OutDateTime(const sal_Char* pStr, const util::DateTime& rDT )
{
- Strm() << '{' << pStr << OOO_STRING_SVTOOLS_RTF_YR;
- OutULong( rDT.Year ) << OOO_STRING_SVTOOLS_RTF_MO;
- OutULong( rDT.Month ) << OOO_STRING_SVTOOLS_RTF_DY;
- OutULong( rDT.Day ) << OOO_STRING_SVTOOLS_RTF_HR;
- OutULong( rDT.Hours ) << OOO_STRING_SVTOOLS_RTF_MIN;
- OutULong( rDT.Minutes ) << '}';
+ 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 );
+ OutULong( rDT.Minutes ).WriteChar( '}' );
}
sal_uInt16 RtfExport::GetColor( const Color& rColor ) const
@@ -1065,12 +1065,12 @@ void RtfExport::OutColorTable()
const Color& rCol = m_aColTbl[ n ];
if( n || COL_AUTO != rCol.GetColor() )
{
- Strm() << OOO_STRING_SVTOOLS_RTF_RED;
- OutULong( rCol.GetRed() ) << OOO_STRING_SVTOOLS_RTF_GREEN;
- OutULong( rCol.GetGreen() ) << OOO_STRING_SVTOOLS_RTF_BLUE;
+ 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 );
OutULong( rCol.GetBlue() );
}
- Strm() << ';';
+ Strm().WriteChar( ';' );
}
}
@@ -1121,13 +1121,13 @@ void RtfExport::OutPageDescription( const SwPageDesc& rPgDsc, bool bWriteReset,
if( bWriteReset )
{
if( pCurPam->GetPoint()->nNode == pOrigPam->Start()->nNode )
- Strm() << OOO_STRING_SVTOOLS_RTF_SECTD << OOO_STRING_SVTOOLS_RTF_SBKNONE;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SECTD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SBKNONE );
else
- Strm() << OOO_STRING_SVTOOLS_RTF_SECT << OOO_STRING_SVTOOLS_RTF_SECTD;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SECT ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SECTD );
}
if( pAktPageDesc->GetLandscape() )
- Strm() << OOO_STRING_SVTOOLS_RTF_LNDSCPSXN;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LNDSCPSXN );
const SwFmt *pFmt = &pAktPageDesc->GetMaster(); //GetLeft();
bOutPageDescs = true;
@@ -1146,7 +1146,7 @@ void RtfExport::OutPageDescription( const SwPageDesc& rPgDsc, bool bWriteReset,
// title page
if( pAktPageDesc != &rPgDsc )
{
- Strm() << OOO_STRING_SVTOOLS_RTF_TITLEPG;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TITLEPG );
pAktPageDesc = &rPgDsc;
if( pAktPageDesc->GetMaster().GetAttrSet().GetItemState( RES_HEADER,
sal_False, &pItem ) == SFX_ITEM_SET )
@@ -1184,12 +1184,12 @@ void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader)
/* is this a title page? */
if( pAktPageDesc->GetFollow() && pAktPageDesc->GetFollow() != pAktPageDesc )
{
- Strm() << OOO_STRING_SVTOOLS_RTF_TITLEPG;
+ Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TITLEPG );
pStr = (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADERF : OOO_STRING_SVTOOLS_RTF_FOOTERF);
}
- Strm() << '{' << pStr;
+ Strm().WriteChar( '{' ).WriteCharPtr( pStr );
WriteHeaderFooterText(pAktPageDesc->GetMaster(), bHeader);
- Strm() << '}';
+ Strm().WriteChar( '}' );
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end");
}
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index fbf7bf0c65c9..07f43f937710 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1478,7 +1478,7 @@ void SwEscherEx::WritePictures()
mxGlobal->SetNewBlipStreamOffset( nEndPos );
pPicStrm->Seek( 0 );
- rWrt.Strm() << *pPicStrm;
+ rWrt.Strm().WriteStream( *pPicStrm );
}
Flush();
}
@@ -2244,7 +2244,7 @@ void SwBasicEscherEx::WritePictures()
mxGlobal->WriteBlibStoreEntry(*pEscherStrm, 1, sal_True, nEndPos);
pPicStrm->Seek(0);
- *pEscherStrm << *pPicStrm;
+ pEscherStrm->WriteStream( *pPicStrm );
}
}
@@ -2407,7 +2407,7 @@ SwEscherEx::~SwEscherEx()
void SwEscherEx::FinishEscher()
{
pEscherStrm->Seek(0);
- *rWrt.pTableStrm << *pEscherStrm;
+ rWrt.pTableStrm->WriteStream( *pEscherStrm );
delete pEscherStrm, pEscherStrm = 0;
}
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 9ccd4d7eea86..20fa739b7f05 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -280,7 +280,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
rWrt.WriteAsStringTable(aNames, rWrt.pFib->fcSttbfbkmk,rWrt.pFib->lcbSttbfbkmk);
SvStream& rStrm = rWrt.bWrtWW8 ? *rWrt.pTableStrm : rWrt.Strm();
rWrt.pFib->fcPlcfbkf = rStrm.Tell();
- rStrm<<aTempStrm1;
+ rStrm.WriteStream( aTempStrm1 );
SwWW8Writer::WriteLong(rStrm, rWrt.pFib->ccpText + rWrt.pFib->ccpTxbx);
for (aItr = aSttCps.begin();aItr!=aSttCps.end();++aItr)
{
@@ -291,7 +291,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
}
rWrt.pFib->lcbPlcfbkf = rStrm.Tell() - rWrt.pFib->fcPlcfbkf;
rWrt.pFib->fcPlcfbkl = rStrm.Tell();
- rStrm<<aTempStrm2;
+ rStrm.WriteStream( aTempStrm2 );
SwWW8Writer::WriteLong(rStrm, rWrt.pFib->ccpText + rWrt.pFib->ccpTxbx);
rWrt.pFib->lcbPlcfbkl = rStrm.Tell() - rWrt.pFib->fcPlcfbkl;
}
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index f708f9e300b3..ab4336bcd0c8 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -113,18 +113,18 @@ void SwBaseNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, sal_uInt16 n
// PROTECTED METHODS ----------------------------------------------------
sal_Bool SwBaseNumRules::Store(SvStream &rStream)
{
- rStream << ACT_NUM_VERSION;
+ rStream.WriteUInt16( ACT_NUM_VERSION );
// Write, what positions are occupied by a rule
// Then write each of the rules
for(sal_uInt16 i = 0; i < nMaxRules; ++i)
{
if(pNumRules[i])
{
- rStream << (unsigned char) sal_True;
+ rStream.WriteUChar( (unsigned char) sal_True );
pNumRules[i]->Store( rStream );
}
else
- rStream << (unsigned char) sal_False;
+ rStream.WriteUChar( (unsigned char) sal_False );
}
return sal_True;
}
@@ -269,11 +269,11 @@ void SwNumRulesWithName::Store( SvStream &rStream )
_SwNumFmtGlobal* pFmt = aFmts[ n ];
if( pFmt )
{
- rStream << (char)1;
+ rStream.WriteChar( (char)1 );
pFmt->Store( rStream );
}
else
- rStream << (char)0;
+ rStream.WriteChar( (char)0 );
}
}
@@ -470,28 +470,28 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
nPitch = (sal_uInt16)pFnt->GetPitch();
}
- rStream << sal_uInt16(aFmt.GetNumberingType())
- << aFmt.GetBulletChar()
- << static_cast<sal_Bool>(aFmt.GetIncludeUpperLevels() > 0)
- << aFmt.GetStart();
+ rStream.WriteUInt16( sal_uInt16(aFmt.GetNumberingType()) )
+ .WriteUInt16( aFmt.GetBulletChar() )
+ .WriteUChar( static_cast<sal_Bool>(aFmt.GetIncludeUpperLevels() > 0) )
+ .WriteUInt16( aFmt.GetStart() );
rStream.WriteUniOrByteString( aFmt.GetPrefix(), eEncoding );
rStream.WriteUniOrByteString( aFmt.GetSuffix(), eEncoding );
- rStream << sal_uInt16( aFmt.GetNumAdjust() )
- << aFmt.GetAbsLSpace()
- << aFmt.GetFirstLineOffset()
- << aFmt.GetCharTextDistance()
- << aFmt.GetLSpace()
- << sal_False;//aFmt.IsRelLSpace();
+ rStream.WriteUInt16( sal_uInt16( aFmt.GetNumAdjust() ) )
+ .WriteInt16( aFmt.GetAbsLSpace() )
+ .WriteInt16( aFmt.GetFirstLineOffset() )
+ .WriteInt16( aFmt.GetCharTextDistance() )
+ .WriteInt16( aFmt.GetLSpace() )
+ .WriteUChar( sal_False );//aFmt.IsRelLSpace();
rStream.WriteUniOrByteString( aName, eEncoding );
- rStream << nFamily
- << nCharSet
- << nWidth
- << nHeight
- << nPitch;
+ rStream.WriteUInt16( nFamily )
+ .WriteUInt16( nCharSet )
+ .WriteInt16( nWidth )
+ .WriteInt16( nHeight )
+ .WriteUInt16( nPitch );
}
- rStream << nCharPoolId;
+ rStream.WriteUInt16( nCharPoolId );
rStream.WriteUniOrByteString( sCharFmtName, eEncoding );
- rStream << static_cast<sal_uInt16>(aItems.size());
+ rStream.WriteUInt16( static_cast<sal_uInt16>(aItems.size()) );
for( sal_uInt16 n = aItems.size(); n; )
{
@@ -499,8 +499,8 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
sal_uInt16 nIVers = pItem->GetVersion( SOFFICE_FILEFORMAT_50 );
OSL_ENSURE( nIVers != USHRT_MAX,
"Was'n das: Item-Version USHRT_MAX in der aktuellen Version" );
- rStream << pItem->Which()
- << nIVers;
+ rStream.WriteUInt16( pItem->Which() )
+ .WriteUInt16( nIVers );
pItem->Store( rStream, nIVers );
}
@@ -508,22 +508,22 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
if( SVX_NUM_BITMAP == aFmt.GetNumberingType() )
{
- rStream << (sal_Int32)aFmt.GetGraphicSize().Width()
- << (sal_Int32)aFmt.GetGraphicSize().Height();
+ rStream.WriteInt32( (sal_Int32)aFmt.GetGraphicSize().Width() )
+ .WriteInt32( (sal_Int32)aFmt.GetGraphicSize().Height() );
sal_uInt8 cFlg = ( 0 != aFmt.GetBrush() ? 1 : 0 ) +
( 0 != aFmt.GetGraphicOrientation() ? 2 : 0 );
- rStream << cFlg;
+ rStream.WriteUChar( cFlg );
if( aFmt.GetBrush() )
{
sal_uInt16 nVersion = aFmt.GetBrush()->GetVersion( SOFFICE_FILEFORMAT_50 );
- rStream << nVersion;
+ rStream.WriteUInt16( nVersion );
aFmt.GetBrush()->Store( rStream, nVersion );
}
if( aFmt.GetGraphicOrientation() )
{
sal_uInt16 nVersion = aFmt.GetGraphicOrientation()->GetVersion( SOFFICE_FILEFORMAT_50 );
- rStream << nVersion;
+ rStream.WriteUInt16( nVersion );
aFmt.GetGraphicOrientation()->Store( rStream, nVersion );
}
}
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 824cfbc0b276..d07f2fb02941 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -674,7 +674,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
if( pSrcStm )
{
xStream->SetBufferSize( 0xff00 );
- *xStream << *pSrcStm;
+ xStream->WriteStream( *pSrcStm );
delete pSrcStm;
}
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 387ee0b22f8e..4b87d6fc3db2 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1235,17 +1235,17 @@ sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
if( rOStm.GetVersion() >= SOFFICE_FILEFORMAT_50 )
{
// write ID for new format (5.0)
- rOStm << GRAPHIC_FORMAT_50;
+ rOStm.WriteUInt32( GRAPHIC_FORMAT_50 );
// write new style header
VersionCompat* pCompat = new VersionCompat( rOStm, STREAM_WRITE, 1 );
//#fdo39428 SvStream no longer supports operator<<(long)
- rOStm << sal::static_int_cast<sal_Int32>(meType);
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(meType) );
// data size is updated later
nDataFieldPos = rOStm.Tell();
- rOStm << (sal_Int32) 0;
+ rOStm.WriteInt32( (sal_Int32) 0 );
WritePair( rOStm, aSize );
WriteMapMode( rOStm, aMapMode );
@@ -1255,21 +1255,21 @@ sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
else
{
// write old style (<=4.0) header
- rOStm << (sal_Int32) meType;
+ rOStm.WriteInt32( (sal_Int32) meType );
// data size is updated later
nDataFieldPos = rOStm.Tell();
- rOStm << (sal_Int32) 0;
+ rOStm.WriteInt32( (sal_Int32) 0 );
//#fdo39428 SvStream no longer supports operator<<(long)
- rOStm << sal::static_int_cast<sal_Int32>(aSize.Width());
- rOStm << sal::static_int_cast<sal_Int32>(aSize.Height());
- rOStm << sal::static_int_cast<sal_Int32>(aMapMode.GetMapUnit());
- rOStm << sal::static_int_cast<sal_Int32>(aMapMode.GetScaleX().GetNumerator());
- rOStm << sal::static_int_cast<sal_Int32>(aMapMode.GetScaleX().GetDenominator());
- rOStm << sal::static_int_cast<sal_Int32>(aMapMode.GetScaleY().GetNumerator());
- rOStm << sal::static_int_cast<sal_Int32>(aMapMode.GetScaleY().GetDenominator());
- rOStm << sal::static_int_cast<sal_Int32>(aMapMode.GetOrigin().X());
- rOStm << sal::static_int_cast<sal_Int32>(aMapMode.GetOrigin().Y());
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(aSize.Width()) );
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(aSize.Height()) );
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(aMapMode.GetMapUnit()) );
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(aMapMode.GetScaleX().GetNumerator()) );
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(aMapMode.GetScaleX().GetDenominator()) );
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(aMapMode.GetScaleY().GetNumerator()) );
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(aMapMode.GetScaleY().GetDenominator()) );
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(aMapMode.GetOrigin().X()) );
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(aMapMode.GetOrigin().Y()) );
}
// write data block
@@ -1285,7 +1285,7 @@ sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
const sal_uLong nStmPos2 = rOStm.Tell();
rOStm.Seek( nDataFieldPos );
//fdo39428 SvStream no longer supports operator<<(long)
- rOStm << sal::static_int_cast<sal_Int32>(nStmPos2 - nDataStart);
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(nStmPos2 - nDataStart) );
rOStm.Seek( nStmPos2 );
bRet = sal_True;
}
@@ -1751,7 +1751,7 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic )
VersionCompat* pCompat;
// native format
- rOStm << NATIVE_FORMAT_50;
+ rOStm.WriteUInt32( NATIVE_FORMAT_50 );
// write compat info
pCompat = new VersionCompat( rOStm, STREAM_WRITE, 1 );
@@ -1783,8 +1783,8 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic )
// no problem to extend it; only used at runtime
const sal_uInt32 nSvgMagic((sal_uInt32('s') << 24) | (sal_uInt32('v') << 16) | (sal_uInt32('g') << 8) | sal_uInt32('0'));
- rOStm << nSvgMagic;
- rOStm << rImpGraphic.getSvgData()->getSvgDataArrayLength();
+ rOStm.WriteUInt32( nSvgMagic );
+ rOStm.WriteUInt32( rImpGraphic.getSvgData()->getSvgDataArrayLength() );
rOStm.Write(rImpGraphic.getSvgData()->getSvgDataArray().get(), rImpGraphic.getSvgData()->getSvgDataArrayLength());
rOStm.WriteUniOrByteString(rImpGraphic.getSvgData()->getPath(),
rOStm.GetStreamCharSet());
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 60932114ad23..75f783a409d8 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -98,7 +98,7 @@ sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescri
{
SvStream* pOut = utl::UcbStreamHelper::CreateStream(aOutStr, STREAM_WRITE);
SvStream* pIn = utl::UcbStreamHelper::CreateStream(xInputStream);
- *pOut << *pIn;
+ pOut->WriteStream( *pIn );
delete pOut;
return true;
}