summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx5
-rw-r--r--sw/source/filter/html/htmldraw.cxx8
-rw-r--r--sw/source/filter/html/htmlfldw.cxx18
-rw-r--r--sw/source/filter/html/htmlfly.cxx62
-rw-r--r--sw/source/filter/html/htmlftn.cxx24
-rw-r--r--sw/source/filter/html/htmlnum.cxx6
-rw-r--r--sw/source/filter/html/htmlplug.cxx40
-rw-r--r--sw/source/filter/writer/writer.cxx2
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx6
-rw-r--r--sw/source/filter/ww8/rtfstringbuffer.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx64
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx12
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx6
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx20
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
16 files changed, 139 insertions, 140 deletions
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 083e76594e56..913476a1f115 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -156,13 +156,12 @@ sal_uLong SwASCWriter::WriteStream()
switch(GetAsciiOptions().GetCharSet())
{
case RTL_TEXTENCODING_UTF8:
- Strm() << sal_uInt8(0xEF) << sal_uInt8(0xBB) <<
- sal_uInt8(0xBF);
+ Strm().WriteUChar( sal_uInt8(0xEF) ).WriteUChar( sal_uInt8(0xBB) ). WriteUChar( sal_uInt8(0xBF) );
break;
case RTL_TEXTENCODING_UCS2:
Strm().SetEndianSwap(sal_False);
#ifdef OSL_LITENDIAN
- Strm() << sal_uInt8(0xFF) << sal_uInt8(0xFE);
+ Strm().WriteUChar( sal_uInt8(0xFF) ).WriteUChar( sal_uInt8(0xFE) );
#else
Strm() << sal_uInt8(0xFE) << sal_uInt8(0xFF);
#endif
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index 4d512ce68421..39ef0907a421 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -812,12 +812,12 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
((const XFillColorItem&)rItemSet.Get(XATTR_FILLCOLOR)).GetColorValue();
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append("=");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor, rHTMLWrt.eDestEnc );
}
if (!sOut.isEmpty())
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// und nun noch ALIGN, HSPACE und VSPACE
sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE;
@@ -828,7 +828,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, &rSdrObject );
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
// Was jetzt kommt ist das Gegenstueck zu SdrTextObjectt::SetText()
Outliner aOutliner(0, OUTLINERMODE_TEXTOBJECT);
@@ -842,7 +842,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_marquee, sal_False );
if( !aEndTags.isEmpty() )
- rWrt.Strm() << aEndTags.getStr();
+ rWrt.Strm().WriteCharPtr( aEndTags.getStr() );
return rWrt;
}
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 29c9c7646bd5..70887214f610 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -276,7 +276,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
{
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(), aName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
@@ -284,7 +284,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
{
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(), aValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
@@ -301,7 +301,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed);
}
sOut.append('>');
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
}
// Inhalt des Feldes ausgeben
@@ -448,14 +448,14 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
OUString rTxt(comphelper::string::strip(pFld->GetPar2(), ' '));
- rWrt.Strm() << '<';
+ rWrt.Strm().WriteChar( '<' );
if( !bOn )
- rWrt.Strm() << '/';
+ rWrt.Strm().WriteChar( '/' );
// TODO: HTML-Tags are written without entitities, that for, characters
// not contained in the destination encoding are lost!
OString sTmp(OUStringToOString(rTxt,
((SwHTMLWriter&)rWrt).eDestEnc));
- rWrt.Strm() << sTmp.getStr() << '>';
+ rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteChar( '>' );
}
else if( RES_POSTITFLD == pFldTyp->Which() )
{
@@ -476,7 +476,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
// characters not contained in the destination encoding are lost!
OString sTmp(OUStringToOString(sComment,
((SwHTMLWriter&)rWrt).eDestEnc));
- rWrt.Strm() << sTmp.getStr();
+ rWrt.Strm().WriteCharPtr( sTmp.getStr() );
bWritten = true;
}
else if( rComment.getLength() >= 7 &&
@@ -492,7 +492,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
// lost!
OString sTmp(OUStringToOString(sComment,
((SwHTMLWriter&)rWrt).eDestEnc));
- rWrt.Strm() << sTmp.getStr();
+ rWrt.Strm().WriteCharPtr( sTmp.getStr() );
bWritten = true;
}
@@ -506,7 +506,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_comment)
.append(' ').append(OUStringToOString(sComment,
((SwHTMLWriter&)rWrt).eDestEnc)).append(" -->");
- rWrt.Strm() << sOut.getStr();
+ rWrt.Strm().WriteCharPtr( sOut.getStr() );
}
}
else if( RES_SCRIPTFLD == pFldTyp->Which() )
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index c210b56fdbcf..64b8480ebb91 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -446,7 +446,7 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
sOut.append('<').append(pCntnrStr).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"")
.append("sd-abs-pos").append('\"');
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// Fuer Nicht-Zeichenobekte eine Breite ausgeben
sal_uLong nFrmFlags = HTML_FRMOPTS_CNTNR;
@@ -458,7 +458,7 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
if( IsHTMLMode( HTMLMODE_BORDER_NONE ) )
nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags, pSdrObject );
- Strm() << '>';
+ Strm().WriteChar( '>' );
if( HTML_CNTNR_DIV == nCntnrMode )
{
@@ -543,7 +543,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
(nFrmOpts & HTML_FRMOPT_ID) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name;
sOut.append(' ').append(pStr).
append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), rFrmFmt.GetName(), eDestEnc, &aNonConvertableCharacters );
sOut.append('\"');
}
@@ -552,7 +552,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
if( nFrmOpts & HTML_FRMOPT_DIR )
{
sal_uInt16 nDir = GetHTMLDirection( rItemSet );
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OutDirection( nDir );
}
@@ -562,7 +562,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt).
append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), rAlternateTxt, eDestEnc, &aNonConvertableCharacters );
sOut.append('\"');
}
@@ -743,7 +743,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
}
if (!sOut.isEmpty())
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// Umlauf fuer absatzgeb. Grafiken als <BR CLEAR=...> in den String
// schreiben
@@ -998,7 +998,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_href).
append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
rHTMLWrt.OutHyperlinkHRefValue( aMapURL );
sOut.append('\"');
}
@@ -1007,7 +1007,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
{
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(), aName,
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
@@ -1017,14 +1017,14 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
{
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(), aTarget,
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
if (!sOut.isEmpty())
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
if( pMacItem )
{
@@ -1037,7 +1037,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
&rHTMLWrt.aNonConvertableCharacters );
}
- rWrt.Strm() << ">";
+ rWrt.Strm().WriteCharPtr( ">" );
aEndTags = OStringBuffer().append("</").
append(OOO_STRING_SVTOOLS_HTML_anchor).
append(">").append(aEndTags).
@@ -1108,9 +1108,9 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
sOut.append('<');
sOut.append(OOO_STRING_SVTOOLS_HTML_font).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(),
- pColBorderLine->GetColor(), rHTMLWrt.eDestEnc ) << '>';
+ pColBorderLine->GetColor(), rHTMLWrt.eDestEnc ).WriteChar( '>' );
aEndTags = OStringBuffer().
append("</").
@@ -1123,7 +1123,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
sOut.append(OOO_STRING_SVTOOLS_HTML_image).append(' ').
append(OOO_STRING_SVTOOLS_HTML_O_src).
append("=\"").append(OOO_STRING_SVTOOLS_HTML_O_data).append(":");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OUString aGraphicInBase64;
sal_uLong nErr = XOutBitmap::GraphicToBase64(rGraphic, aGraphicInBase64);
@@ -1131,7 +1131,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
{
rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
}
- HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << '\"';
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' );
// Events
if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRMMACRO, sal_True, &pItem ))
@@ -1154,26 +1154,26 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_border).
append("=\"").append(static_cast<sal_Int32>(nBorderWidth)).append("\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
}
if( pURLItem && pURLItem->IsServerMap() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_ismap);
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
}
if( !aIMapName.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_usemap).
append("=\"#");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
- HTMLOutFuncs::Out_String( rWrt.Strm(), aIMapName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << '\"';
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aIMapName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' );
}
- rHTMLWrt.Strm() << '>';
+ rHTMLWrt.Strm().WriteChar( '>' );
if( !aEndTags.isEmpty() )
- rWrt.Strm() << aEndTags.getStr();
+ rWrt.Strm().WriteCharPtr( aEndTags.getStr() );
if( !rHTMLWrt.aINetFmts.empty() )
{
@@ -1215,7 +1215,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
sOut.append(' ');
sOut.append(OOO_STRING_SVTOOLS_HTML_O_src).append("=\"").
append(OOO_STRING_SVTOOLS_HTML_O_data).append(":");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
@@ -1269,7 +1269,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
if (pTag)
sOut.append('>');
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
return rWrt;
}
@@ -1366,7 +1366,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
append("=\"").append(static_cast<sal_Int32>(nGutter)).append("\"");
}
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// WIDTH
sal_uLong nFrmFlags = bInCntnr ? HTML_FRMOPTS_MULTICOL_CNTNR
@@ -1377,7 +1377,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
rHTMLWrt.bLFPossible = sal_True;
rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken;
@@ -1418,14 +1418,14 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_spacer).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_type).append("=\"")
.append(OOO_STRING_SVTOOLS_HTML_SPTYPE_block).append("\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// ALIGN, WIDTH, HEIGHT
OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, HTML_FRMOPTS_SPACER );
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
if( !aEndTags.isEmpty() )
- rWrt.Strm() << aEndTags.getStr();
+ rWrt.Strm().WriteCharPtr( aEndTags.getStr() );
return rWrt;
}
@@ -1454,13 +1454,13 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
OStringBuffer sOut;
sOut.append('<').append(pStr);
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
sal_uLong nFrmFlags = HTML_FRMOPTS_DIV;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) )
nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, nFrmFlags );
rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
rHTMLWrt.IncIndentLevel(); // den Inhalt einruecken
rHTMLWrt.bLFPossible = sal_True;
@@ -1490,7 +1490,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, sal_False );
if( !aEndTags.isEmpty() )
- rWrt.Strm() << aEndTags.getStr();
+ rWrt.Strm().WriteCharPtr( aEndTags.getStr() );
return rWrt;
}
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 6afdc96cb3f3..98609a6ebf6b 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -295,20 +295,20 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
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(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\" ")
.append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append('\"');
if( !rFmtFtn.GetNumStr().isEmpty() )
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed);
sOut.append('>');
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, sal_True );
HTMLOutFuncs::Out_String( rWrt.Strm(), rFmtFtn.GetViewNumStr(*rWrt.pDoc),
@@ -355,9 +355,9 @@ void SwHTMLWriter::OutFootEndNotes()
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division)
.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id).append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
- Strm() << "\">";
+ Strm().WriteCharPtr( "\">" );
bLFPossible = sal_True;
IncIndentLevel(); // Inhalt von <DIV> einruecken
@@ -463,17 +463,17 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn,
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), sClass, eDestEnc, &aNonConvertableCharacters );
sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append("\" ")
.append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\">");
- Strm() << sOut.makeStringAndClear().getStr();
+ Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), rNum, eDestEnc, &aNonConvertableCharacters );
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False );
@@ -534,9 +534,9 @@ static void lcl_html_outFootEndNoteInfo( Writer& rWrt, OUString *pParts,
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"").append(pName)
.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content).append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), aContent, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
- rWrt.Strm() << "\">";
+ rWrt.Strm().WriteCharPtr( "\">" );
}
void SwHTMLWriter::OutFootEndNoteInfo()
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 491abb8b1ad3..323bd7d1972d 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -824,7 +824,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
{
// Unordered list: <UL>
sOut.append(OOO_STRING_SVTOOLS_HTML_unorderlist);
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
OutHTML_BulletImage( rWrt,
0,
rNumFmt.GetBrush(),
@@ -873,12 +873,12 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
}
if (!sOut.isEmpty())
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
if( rWrt.bCfgOutStyles )
OutCSS1_NumBulListStyleOpt( rWrt, *rInfo.GetNumRule(), (sal_uInt8)i );
- rWrt.Strm() << '>';
+ rWrt.Strm().WriteChar( '>' );
rWrt.IncIndentLevel(); // Inhalt von <OL> einruecken
}
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 57f1a1901ca4..7da37d9183c7 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1040,7 +1040,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
{
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(), aURL, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
@@ -1051,7 +1051,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type)
.append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), aType, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
@@ -1086,7 +1086,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_codebase)
.append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), sCodeBase, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
@@ -1098,7 +1098,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
aAny >>= aClass;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_code)
.append("=\"");
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
@@ -1110,7 +1110,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
{
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(), aAppletName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sOut.append('\"');
}
@@ -1129,7 +1129,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
// oder das Flating-Frame spezifische
sOut.append(OOO_STRING_SVTOOLS_HTML_iframe);
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
SfxFrameHTMLWriter::Out_FrameDescriptor( rWrt.Strm(), rWrt.GetBaseURL(),
xSet,
@@ -1140,7 +1140,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
: HTML_FRMOPTS_IFRAME;
}
- rWrt.Strm() << sOut.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
// ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
@@ -1170,10 +1170,10 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
if( SWHTML_OPTTYPE_TAG == nType )
{
const OUString& rValue = rCommand.GetArgument();
- rWrt.Strm() << ' ';
+ rWrt.Strm().WriteChar( ' ' );
HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
- rWrt.Strm() << "=\"";
- HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << '\"';
+ rWrt.Strm().WriteCharPtr( "=\"" );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' );
}
else if( SWHTML_OPTTYPE_PARAM == nType )
{
@@ -1181,7 +1181,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
}
}
- rHTMLWrt.Strm() << '>';
+ rHTMLWrt.Strm().WriteChar( '>' );
rHTMLWrt.IncIndentLevel(); // Inhalt von Applet einruecken
@@ -1196,12 +1196,12 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
sBuf.append('<').append(OOO_STRING_SVTOOLS_HTML_param)
.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
.append("=\"");
- rWrt.Strm() << sBuf.makeStringAndClear().getStr();
+ rWrt.Strm().WriteCharPtr( sBuf.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
sBuf.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_value)
.append("=\"");
- rWrt.Strm() << sBuf.makeStringAndClear().getStr();
- HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << "\">";
+ rWrt.Strm().WriteCharPtr( sBuf.makeStringAndClear().getStr() );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteCharPtr( "\">" );
}
rHTMLWrt.DecIndentLevel(); // Inhalt von Applet einruecken
@@ -1227,25 +1227,25 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
if( SwApplet_Impl::GetOptionType( rName, sal_False ) == SWHTML_OPTTYPE_TAG )
{
const OUString& rValue = rCommand.GetArgument();
- rWrt.Strm() << ' ';
+ rWrt.Strm().WriteChar( ' ' );
HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
- rWrt.Strm() << "=\"";
- HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << '\"';
+ rWrt.Strm().WriteCharPtr( "=\"" );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' );
}
}
- rHTMLWrt.Strm() << '>';
+ rHTMLWrt.Strm().WriteChar( '>' );
}
else
{
// und fuer Floating-Frames einfach noch ein </IFRAME>
// ausgeben
- rHTMLWrt.Strm() << '>';
+ rHTMLWrt.Strm().WriteChar( '>' );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_iframe, sal_False );
}
if( !aEndTags.isEmpty() )
- rWrt.Strm() << aEndTags.getStr();
+ rWrt.Strm().WriteCharPtr( aEndTags.getStr() );
return rWrt;
}
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 5245cd38715c..d05364c01c87 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -52,7 +52,7 @@ SvStream& lcl_OutLongExt( SvStream& rStrm, sal_uLong nVal, bool bNeg )
if (bNeg)
aBuf[--i] = '-';
- return rStrm << &aBuf[i];
+ return rStrm.WriteCharPtr( &aBuf[i] );
}
}
diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx
index 73732b830664..2aaf2b3317ce 100644
--- a/sw/source/filter/ww8/WW8FFData.cxx
+++ b/sw/source/filter/ww8/WW8FFData.cxx
@@ -72,7 +72,7 @@ void WW8FFData::WriteOUString(SvStream * pDataStrm, const OUString & rStr,
bool bAddZero)
{
sal_uInt16 nStrLen = msword_cast<sal_uInt16>(rStr.getLength());
- *pDataStrm << nStrLen;
+ pDataStrm->WriteUInt16( nStrLen );
SwWW8Writer::WriteString16(*pDataStrm, rStr, bAddZero);
}
@@ -131,7 +131,7 @@ void WW8FFData::Write(SvStream * pDataStrm)
if (mnType == 0)
WriteOUString(pDataStrm, msDefault, true);
else
- *pDataStrm << mnDefault;
+ pDataStrm->WriteUInt16( mnDefault );
WriteOUString(pDataStrm, msFormat, true);
WriteOUString(pDataStrm, msHelp, true);
@@ -145,7 +145,7 @@ void WW8FFData::Write(SvStream * pDataStrm)
pDataStrm->Write(aData1, sizeof(aData1));
sal_uInt32 nListboxEntries = msListEntries.size();
- *pDataStrm << nListboxEntries;
+ pDataStrm->WriteUInt32( nListboxEntries );
::std::vector< OUString >::const_iterator aIt = msListEntries.begin();
diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx b/sw/source/filter/ww8/rtfstringbuffer.cxx
index 811cba097c8a..1d652db1faa0 100644
--- a/sw/source/filter/ww8/rtfstringbuffer.cxx
+++ b/sw/source/filter/ww8/rtfstringbuffer.cxx
@@ -26,7 +26,7 @@ RtfStringBufferValue::RtfStringBufferValue(const SwFlyFrmFmt* pFlyFrmFmt, const
void RtfStringBufferValue::makeStringAndClear(RtfAttributeOutput* pAttributeOutput)
{
if (!isGraphic())
- pAttributeOutput->m_rExport.Strm() << m_aBuffer.makeStringAndClear().getStr();
+ pAttributeOutput->m_rExport.Strm().WriteCharPtr( m_aBuffer.makeStringAndClear().getStr() );
else
pAttributeOutput->FlyFrameGraphic(m_pFlyFrmFmt, m_pGrfNode);
}
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 47db18eb99ad..e605bc079805 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -212,7 +212,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm
SwWW8Writer::WriteLong(tmpStrm, rTarFrm.getLength()+1);
SwWW8Writer::WriteString16(tmpStrm, rTarFrm, false);
- tmpStrm << sal_uInt16( 0 );
+ tmpStrm.WriteUInt16( sal_uInt16( 0 ) );
mnFlags |= WW8_HLINK_FRAME;
}
@@ -230,7 +230,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm
mnFlags |= WW8_HLINK_BODY;
tmpStrm.Write( maGuidFileMoniker,sizeof(maGuidFileMoniker) );
- tmpStrm << nLevel;
+ tmpStrm.WriteUInt16( nLevel );
SwWW8Writer::WriteLong(tmpStrm, aFileName.getLength()+1);
SwWW8Writer::WriteString8( tmpStrm, aFileName, true, RTL_TEXTENCODING_MS_1252 );
tmpStrm.Write( maGuidFileTail,sizeof(maGuidFileTail) );
@@ -238,7 +238,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm
//For UNICODE
SwWW8Writer::WriteLong(tmpStrm, 2*aFileName.getLength()+6);
SwWW8Writer::WriteLong(tmpStrm, 2*aFileName.getLength());
- tmpStrm << sal_uInt16(0x0003);
+ tmpStrm.WriteUInt16( sal_uInt16(0x0003) );
SwWW8Writer::WriteString16(tmpStrm, aFileName, false);
}
else if( eProtocol != INET_PROT_NOT_VALID )
@@ -270,8 +270,8 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm
}
rStrm.Write( maGuidStdLink,16 );
- rStrm << sal_uInt32( 2 )
- << mnFlags;
+ rStrm .WriteUInt32( sal_uInt32( 2 ) )
+ .WriteUInt32( mnFlags );
tmpStrm.Seek( STREAM_SEEK_TO_BEGIN );
sal_uInt32 nStrmPos = tmpStrm.Tell();
tmpStrm.Seek( STREAM_SEEK_TO_END );
@@ -1423,19 +1423,19 @@ void WinwordAnchoring::WriteData( EscherEx& rEx ) const
if (mbInline)
{
rEx.AddAtom(18, DFF_msofbtUDefProp, 3, 3); //Prop id is 0xF122
- rSt << (sal_uInt16)0x0390 << sal_uInt32(3);
- rSt << (sal_uInt16)0x0392 << sal_uInt32(3);
+ rSt.WriteUInt16( (sal_uInt16)0x0390 ).WriteUInt32( sal_uInt32(3) );
+ rSt.WriteUInt16( (sal_uInt16)0x0392 ).WriteUInt32( sal_uInt32(3) );
//This sub property is required to be in the dummy inline frame as
//well
- rSt << (sal_uInt16)0x053F << nInlineHack;
+ rSt.WriteUInt16( (sal_uInt16)0x053F ).WriteUInt32( nInlineHack );
}
else
{
rEx.AddAtom(24, DFF_msofbtUDefProp, 3, 4 ); //Prop id is 0xF122
- rSt << (sal_uInt16)0x038F << mnXAlign;
- rSt << (sal_uInt16)0x0390 << mnXRelTo;
- rSt << (sal_uInt16)0x0391 << mnYAlign;
- rSt << (sal_uInt16)0x0392 << mnYRelTo;
+ rSt.WriteUInt16( (sal_uInt16)0x038F ).WriteUInt32( mnXAlign );
+ rSt.WriteUInt16( (sal_uInt16)0x0390 ).WriteUInt32( mnXRelTo );
+ rSt.WriteUInt16( (sal_uInt16)0x0391 ).WriteUInt32( mnYAlign );
+ rSt.WriteUInt16( (sal_uInt16)0x0392 ).WriteUInt32( mnYRelTo );
}
}
}
@@ -1515,7 +1515,7 @@ SwBasicEscherEx::~SwBasicEscherEx()
void SwBasicEscherEx::WriteFrmExtraData(const SwFrmFmt&)
{
AddAtom(4, ESCHER_ClientAnchor);
- GetStream() << (sal_uInt32)0x80000000;
+ GetStream().WriteUInt32( (sal_uInt32)0x80000000 );
}
void SwBasicEscherEx::WriteEmptyFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShapeId)
@@ -1526,7 +1526,7 @@ void SwBasicEscherEx::WriteEmptyFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShape
WriteFrmExtraData(rFmt);
AddAtom(6, DFF_msofbtUDefProp, 3, 1); //Prop id is 0xF122
- GetStream() << (sal_uInt16)0x053F << nInlineHack;
+ GetStream().WriteUInt16( (sal_uInt16)0x053F ).WriteUInt32( nInlineHack );
CloseContainer(); // ESCHER_SpContainer
}
@@ -1598,7 +1598,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfBullet(const Graphic& rGrf)
aPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0 );
aPropOpt.Commit( GetStream() );
AddAtom(4, ESCHER_ClientAnchor);
- GetStream() << (sal_uInt32)0x80000000;
+ GetStream().WriteUInt32( (sal_uInt32)0x80000000 );
CloseContainer();
return 0;
@@ -2173,13 +2173,13 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType
aPolyDump.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
sal_uInt16 nLen = aPoly.GetSize();
- aPolyDump << nLen;
- aPolyDump << nLen;
- aPolyDump << sal_uInt16(8);
+ aPolyDump.WriteUInt16( nLen );
+ aPolyDump.WriteUInt16( nLen );
+ aPolyDump.WriteUInt16( sal_uInt16(8) );
for (sal_uInt16 nI = 0; nI < nLen; ++nI)
{
- aPolyDump << sal_uInt32(aPoly[nI].X());
- aPolyDump << sal_uInt32(aPoly[nI].Y());
+ aPolyDump.WriteUInt32( sal_uInt32(aPoly[nI].X()) );
+ aPolyDump.WriteUInt32( sal_uInt32(aPoly[nI].Y()) );
}
sal_uInt16 nArrLen = msword_cast<sal_uInt16>(aPolyDump.Tell());
@@ -2256,13 +2256,13 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
OpenContainer( ESCHER_DggContainer );
sal_uInt16 nColorCount = 4;
- *pStrm << (sal_uInt16)( nColorCount << 4 ) // instance
- << (sal_uInt16)ESCHER_SplitMenuColors // record type
- << (sal_uInt32)( nColorCount * 4 ) // size
- << (sal_uInt32)0x08000004
- << (sal_uInt32)0x08000001
- << (sal_uInt32)0x08000002
- << (sal_uInt32)0x100000f7;
+ pStrm ->WriteUInt16( (sal_uInt16)( nColorCount << 4 ) ) // instance
+ .WriteUInt16( (sal_uInt16)ESCHER_SplitMenuColors ) // record type
+ .WriteUInt32( (sal_uInt32)( nColorCount * 4 ) ) // size
+ .WriteUInt32( (sal_uInt32)0x08000004 )
+ .WriteUInt32( (sal_uInt32)0x08000001 )
+ .WriteUInt32( (sal_uInt32)0x08000002 )
+ .WriteUInt32( (sal_uInt32)0x100000f7 );
CloseContainer(); // ESCHER_DggContainer
@@ -2281,7 +2281,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
for( ; i--; pSdrObjs = rWrt.pSdrObjs, pTxtBxs = rWrt.pTxtBxs )
{
// "dummy char" (or any Count ?) - why? This knows only M$
- GetStream() << (sal_Char)i;
+ GetStream().WriteChar( (sal_Char)i );
OpenContainer( ESCHER_DgContainer );
@@ -2392,7 +2392,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
aPropOpt.Commit( *pStrm );
AddAtom( 4, ESCHER_ClientData );
- GetStream() << static_cast<sal_Int32>(1);
+ GetStream().WriteInt32( static_cast<sal_Int32>(1) );
CloseContainer(); // ESCHER_SpContainer
}
@@ -2861,10 +2861,10 @@ void SwEscherEx::WriteFrmExtraData( const SwFrmFmt& rFmt )
aWinwordAnchoring.WriteData(*this);
AddAtom(4, ESCHER_ClientAnchor);
- GetStream() << static_cast<sal_Int32>(0);
+ GetStream().WriteInt32( static_cast<sal_Int32>(0) );
AddAtom(4, ESCHER_ClientData);
- GetStream() << static_cast<sal_Int32>(1);
+ GetStream().WriteInt32( static_cast<sal_Int32>(1) );
}
sal_Int32 SwEscherEx::WriteFlyFrm(const DrawObj &rObj, sal_uInt32 &rShapeId,
@@ -3018,7 +3018,7 @@ sal_Int32 SwEscherEx::WriteTxtFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId,
// store anchor attribute
WriteFrmExtraData( rFmt );
- AddAtom( 4, ESCHER_ClientTextbox ); GetStream() << nTxtBox;
+ AddAtom( 4, ESCHER_ClientTextbox ); GetStream().WriteUInt32( nTxtBox );
CloseContainer(); // ESCHER_SpContainer
return nBorderThick;
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 5083368bcfc1..02a313866aff 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -166,7 +166,7 @@ void WW8AttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &r
if ( rRule.IsContinusNum() )
nFlags |= 0x1;
- *m_rWW8Export.pTableStrm << nFlags << nDummy;
+ m_rWW8Export.pTableStrm->WriteUChar( nFlags ).WriteUChar( nDummy );
}
void MSWordExportBase::NumberingDefinitions()
@@ -204,7 +204,7 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/,
SwWW8Writer::WriteLong( *m_rWW8Export.pTableStrm, nStart );
// Type
- *m_rWW8Export.pTableStrm << WW8Export::GetNumId( nNumberingType );
+ m_rWW8Export.pTableStrm->WriteUChar( WW8Export::GetNumId( nNumberingType ) );
// Justification
sal_uInt8 nAlign;
@@ -220,14 +220,14 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/,
nAlign = 0;
break;
}
- *m_rWW8Export.pTableStrm << nAlign;
+ m_rWW8Export.pTableStrm->WriteUChar( nAlign );
// Write the rgbxchNums[9], positions of placeholders for paragraph
// numbers in the text
m_rWW8Export.pTableStrm->Write( pNumLvlPos, WW8ListManager::nMaxLevel );
// Type of the character between the bullet and the text
- *m_rWW8Export.pTableStrm << nFollow;
+ m_rWW8Export.pTableStrm->WriteUChar( nFollow );
// dxaSoace/dxaIndent (Word 6 compatibility)
SwWW8Writer::WriteLong( *m_rWW8Export.pTableStrm, 0 );
@@ -270,7 +270,7 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/,
m_rWW8Export.pO = pOldpO;
}
- *m_rWW8Export.pTableStrm << sal_uInt8( aCharAtrs.size() );
+ m_rWW8Export.pTableStrm->WriteUChar( sal_uInt8( aCharAtrs.size() ) );
// cbGrpprlPapx
sal_uInt8 aPapSprms [] = {
@@ -278,7 +278,7 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/,
0x60, 0x84, 0, 0, // sprmPDxaLeft1
0x15, 0xc6, 0x05, 0x00, 0x01, 0, 0, 0x06
};
- *m_rWW8Export.pTableStrm << sal_uInt8( sizeof( aPapSprms ) );
+ m_rWW8Export.pTableStrm->WriteUChar( sal_uInt8( sizeof( aPapSprms ) ) );
// reserved
SwWW8Writer::WriteShort( *m_rWW8Export.pTableStrm, 0 );
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 1ed627cb66d1..40731e16137e 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -664,7 +664,7 @@ void WW8AttributeOutput::StartStyles()
sal_uLong nCurPos = m_rWW8Export.pTableStrm->Tell();
if ( nCurPos & 1 ) // Start auf gerader
{
- *m_rWW8Export.pTableStrm << (char)0; // Adress
+ m_rWW8Export.pTableStrm->WriteChar( (char)0 ); // Adress
++nCurPos;
}
rFib.fcStshfOrig = rFib.fcStshf = nCurPos;
@@ -2324,7 +2324,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
for ( i = 0; i < aStrArr.size(); ++i )
{
const OUString& sAuthor = aStrArr[i].first;
- *rWrt.pTableStrm << (sal_uInt8)sAuthor.getLength();
+ rWrt.pTableStrm->WriteUChar( (sal_uInt8)sAuthor.getLength() );
SwWW8Writer::WriteString8(*rWrt.pTableStrm, sAuthor, false,
RTL_TEXTENCODING_MS_1252);
}
@@ -2521,7 +2521,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
}
else
{
- *rWrt.pTableStrm << nInitialsLen;
+ rWrt.pTableStrm->WriteUChar( nInitialsLen );
SwWW8Writer::WriteString8(*rWrt.pTableStrm, sInitials,
false, RTL_TEXTENCODING_MS_1252);
SwWW8Writer::FillCount(*rWrt.pTableStrm, 9 - nInitialsLen);
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 53c3b6123a0e..1c9574826746 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1292,7 +1292,7 @@ void WW8_WrPct::WritePc( WW8Export& rWrt )
boost::ptr_vector<WW8_WrPc>::iterator aIter;
nPctStart = rWrt.pTableStrm->Tell(); // Start piece table
- *rWrt.pTableStrm << ( char )0x02; // Status byte PCT
+ rWrt.pTableStrm->WriteChar( ( char )0x02 ); // Status byte PCT
nOldPos = nPctStart + 1; // remember Position
SwWW8Writer::WriteLong( *rWrt.pTableStrm, 0 ); // then the length
@@ -1608,7 +1608,7 @@ void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings,
{
const OUString &rString = rStrings[n];
const OUString aNm(rString.copy(0, std::min<sal_Int32>(rString.getLength(), 255)));
- rStrm << (sal_uInt8)aNm.getLength();
+ rStrm.WriteUChar( (sal_uInt8)aNm.getLength() );
SwWW8Writer::WriteString8(rStrm, aNm, false,
RTL_TEXTENCODING_MS_1252);
if (nExtraLen)
@@ -1814,9 +1814,9 @@ void WW8Export::WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo
void WW8Export::WriteChar( sal_Unicode c )
{
if( pPiece->IsUnicode() )
- Strm() << c;
+ Strm().WriteUInt16( c );
else
- Strm() << (sal_uInt8)c;
+ Strm().WriteUChar( (sal_uInt8)c );
}
void MSWordExportBase::SaveData( sal_uLong nStt, sal_uLong nEnd )
@@ -3203,7 +3203,7 @@ void WW8Export::ExportDocument_Impl()
// EncryptionVersionInfo (4 bytes): A Version structure where Version.vMajor MUST be 0x0001, and Version.vMinor MUST be 0x0001.
pTableStrmTemp->Seek( 0 );
sal_uInt32 nEncType = 0x10001;
- *pTableStrmTemp << nEncType;
+ pTableStrmTemp->WriteUInt32( nEncType );
sal_uInt8 pDocId[16];
aCtx.GetDocId( pDocId );
@@ -3735,20 +3735,20 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
}
}
- *pDataStrm << slen;
+ pDataStrm->WriteUInt32( slen );
int len = sizeof( aFldData );
OSL_ENSURE( len == 0x44-sizeof(sal_uInt32), "SwWW8Writer::WriteFormData(..) - wrong aFldData length" );
pDataStrm->Write( aFldData, len );
- *pDataStrm << aFldHeader.version << aFldHeader.bits << aFldHeader.cch << aFldHeader.hps;
+ pDataStrm->WriteUInt32( aFldHeader.version ).WriteUInt16( aFldHeader.bits ).WriteUInt16( aFldHeader.cch ).WriteUInt16( aFldHeader.hps );
SwWW8Writer::WriteString_xstz( *pDataStrm, ffname, true ); // Form field name
if ( !type )
SwWW8Writer::WriteString_xstz( *pDataStrm, ffdeftext, true );
if ( type )
- *pDataStrm << sal_uInt16(0);
+ pDataStrm->WriteUInt16( sal_uInt16(0) );
SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffformat ), true );
@@ -3757,9 +3757,9 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffentrymcr ), true );
SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffexitmcr ), true );
if (type==2) {
- *pDataStrm<<(sal_uInt16)0xFFFF;
+ pDataStrm->WriteUInt16( (sal_uInt16)0xFFFF );
const int items=aListItems.size();
- *pDataStrm<<(sal_uInt32)items;
+ pDataStrm->WriteUInt32( (sal_uInt32)items );
for(int i=0;i<items;i++) {
OUString item=aListItems[i];
SwWW8Writer::WriteString_xstz( *pDataStrm, item, false );
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 92677df1b81d..e20674b9f302 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -706,7 +706,7 @@ void SwWW8WrGrf::WriteGrfFromGrfNode(SvStream& rStrm, const SwGrfNode &rGrfNd,
WritePICFHeader(rStrm, rFly, mm, nWidth, nHeight,
rGrfNd.GetpSwAttrSet());
- rStrm << (sal_uInt8)aFileN.getLength(); // write Pascal-String
+ rStrm.WriteUChar( (sal_uInt8)aFileN.getLength() ); // write Pascal-String
SwWW8Writer::WriteString8(rStrm, aFileN, false,
RTL_TEXTENCODING_MS_1252);
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f2029454a0fb..218a13d1d27f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1116,7 +1116,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
SvMemoryStream aMemStream;
struct HyperLinksTable hlStr;
sal_uInt16 mnRawRecId,mnRawRecSize;
- aMemStream << sal_uInt16( 0 ) << static_cast< sal_uInt16 >( nBufferSize );
+ aMemStream.WriteUInt16( sal_uInt16( 0 ) ).WriteUInt16( static_cast< sal_uInt16 >( nBufferSize ) );
// copy from DFF stream to memory stream
::std::vector< sal_uInt8 > aBuffer( nBufferSize );
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 11:05:27 +0000