summaryrefslogtreecommitdiff
path: root/sw
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 /sw
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>
Diffstat (limited to 'sw')
-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
13 files changed, 337 insertions, 339 deletions
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;
}
generated by cgit (git 2.34.1) at 2025-02-04 21:04:22 +0000