diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/html/htmldrawwriter.cxx | 3 | ||||
-rw-r--r-- | sw/source/filter/html/htmlfldw.cxx | 21 | ||||
-rw-r--r-- | sw/source/filter/html/htmlflywriter.cxx | 12 | ||||
-rw-r--r-- | sw/source/filter/html/htmlplug.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/htmltabw.cxx | 7 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfsdrexport.cxx | 8 |
6 files changed, 25 insertions, 30 deletions
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index d22c1b00a866..14ea4ad28d73 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -124,8 +124,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsMarquee( SwHTMLWriter& rWrt, if( !pOutlinerParaObj ) return rWrt; - OStringBuffer sOut; - sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_marquee); + OStringBuffer sOut("<" OOO_STRING_SVTOOLS_HTML_marquee); // get attributes of the object const SfxItemSet& rItemSet = pTextObj->GetMergedItemSet(); diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 6d37a88966e8..fb34dc56ff01 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -268,21 +268,20 @@ static SwHTMLWriter& OutHTML_SwField( SwHTMLWriter& rWrt, const SwField* pField, // Output the <sdfield> tag. if( pTypeStr ) { - OStringBuffer sOut; - sOut.append('<'); - sOut.append(rWrt.GetNamespace()); - sOut.append(OOO_STRING_SVTOOLS_HTML_sdfield).append(' '). - append(OOO_STRING_SVTOOLS_HTML_O_type).append('='). - append(pTypeStr); + OStringBuffer sOut("<" + + rWrt.GetNamespace() + + OOO_STRING_SVTOOLS_HTML_sdfield " " + OOO_STRING_SVTOOLS_HTML_O_type "=" + + pTypeStr); if( pSubStr ) { - sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_subtype). - append('=').append(pSubStr); + sOut.append(OString::Concat(" " OOO_STRING_SVTOOLS_HTML_O_subtype "=") + + pSubStr); } if( pFormatStr ) { - sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_format). - append('=').append(pFormatStr); + sOut.append(OString::Concat(" " OOO_STRING_SVTOOLS_HTML_O_format "=") + + pFormatStr); } if( !aName.isEmpty() ) { @@ -309,7 +308,7 @@ static SwHTMLWriter& OutHTML_SwField( SwHTMLWriter& rWrt, const SwField* pField, } if( bFixed ) { - sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed); + sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_sdfixed); } sOut.append('>'); rWrt.Strm().WriteOString( sOut ); diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 94d4972adb47..b35d25dc7ab6 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -700,7 +700,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_width "=\""); if( nPercentWidth ) - sOut.append(static_cast<sal_Int32>(nPercentWidth)).append('%'); + sOut.append(OString::number(static_cast<sal_Int32>(nPercentWidth)) + "%"); else sOut.append(static_cast<sal_Int32>(aPixelSz.Width())); sOut.append("\""); @@ -711,7 +711,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_height "=\""); if( nPercentHeight ) - sOut.append(static_cast<sal_Int32>(nPercentHeight)).append('%'); + sOut.append(OString::number(static_cast<sal_Int32>(nPercentHeight)) + "%"); else sOut.append(static_cast<sal_Int32>(aPixelSz.Height())); sOut.append("\""); @@ -1521,7 +1521,7 @@ SwHTMLWriter& OutHTML_BulletImage( SwHTMLWriter& rWrt, OStringBuffer sOut; if( pTag ) - sOut.append('<').append(pTag); + sOut.append(OString::Concat("<") + pTag); sOut.append(' '); sOut.append(OOO_STRING_SVTOOLS_HTML_O_style "=\""); @@ -1609,8 +1609,7 @@ static SwHTMLWriter & OutHTML_FrameFormatAsMulticol( SwHTMLWriter& rWrt, if( rWrt.m_bLFPossible ) rWrt.OutNewLine(); - OStringBuffer sOut; - sOut.append('<').append(rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_multicol); + OStringBuffer sOut("<" + rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_multicol); const SwFormatCol& rFormatCol = rFrameFormat.GetCol(); @@ -1717,8 +1716,7 @@ static SwHTMLWriter& OutHTML_FrameFormatAsDivOrSpan( SwHTMLWriter& rWrt, if( rWrt.m_bLFPossible ) rWrt.OutNewLine(); - OStringBuffer sOut; - sOut.append('<').append(rWrt.GetNamespace() + aTag); + OStringBuffer sOut("<" + rWrt.GetNamespace() + aTag); rWrt.Strm().WriteOString( sOut ); sOut.setLength(0); diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 4a7df0582a3b..c9b1c01c6ef6 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -1295,7 +1295,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma css::text::WrapTextMode_THROUGH == rFrameFormat.GetSurround().GetSurround() ) { // A HIDDEN plug-in - sOut.append(' ').append(OOO_STRING_SW_HTML_O_Hidden); + sOut.append(" " OOO_STRING_SW_HTML_O_Hidden); nFrameOpts = HTML_FRMOPTS_HIDDEN_EMBED; bHiddenEmbed = true; } @@ -1354,7 +1354,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma aAny = xSet->getPropertyValue("AppletIsScript"); aAny >>= bScript; if( bScript ) - sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_mayscript); + sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_mayscript); nFrameOpts = bInCntnr ? HTML_FRMOPTS_APPLET_CNTNR : HTML_FRMOPTS_APPLET; diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 9d546c95f37b..17a7874a7d28 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -379,7 +379,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_width "=\""); if( nPercentWidth != SAL_MAX_UINT32 ) { - sOut.append(static_cast<sal_Int32>(nPercentWidth)).append('%'); + sOut.append(OString::number(static_cast<sal_Int32>(nPercentWidth)) + "%"); } else { @@ -642,8 +642,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, if( rWrt.m_bLFPossible ) rWrt.OutNewLine(); // <TABLE> in new line - OStringBuffer sOut; - sOut.append('<').append(rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_table); + OStringBuffer sOut("<" + rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_table); const SvxFrameDirection nOldDirection = rWrt.m_nDirection; if( pFrameFormat ) @@ -677,7 +676,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_width "=\""); if( HasRelWidths() ) - sOut.append(static_cast<sal_Int32>(m_nTabWidth)).append('%'); + sOut.append(OString::number(static_cast<sal_Int32>(m_nTabWidth)) + "%"); else if( Application::GetDefaultDevice() ) { sal_Int32 nPixWidth = Application::GetDefaultDevice()->LogicToPixel( diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 05413a8d2eb6..6b7713795551 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -301,7 +301,7 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const tools::Rectangl unsigned char nSegmentType = (nSeg & 0xE000) >> 13; unsigned short nSegmentCount = nSeg & 0x03FF; - aSegmentInfo.append(';').append(static_cast<sal_Int32>(nSeg)); + aSegmentInfo.append(";" + OString::number(static_cast<sal_Int32>(nSeg))); switch (nSegmentType) { case msopathLineTo: @@ -534,7 +534,7 @@ sal_Int32 RtfSdrExport::StartShape() if (ESCHER_ShpInst_PictureFrame == m_nShapeType) impl_writeGraphic(); - m_rAttrOutput.RunText().append('{').append(OOO_STRING_SVTOOLS_RTF_SHP); + m_rAttrOutput.RunText().append("{" OOO_STRING_SVTOOLS_RTF_SHP); m_rAttrOutput.RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPINST); @@ -669,7 +669,7 @@ void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj, TextTypes e bool bShape = eType == TXT_HFTXTBOX; if (bShape) - m_rAttrOutput.RunText().append('{').append(OOO_STRING_SVTOOLS_RTF_SHPTXT).append(' '); + m_rAttrOutput.RunText().append("{" OOO_STRING_SVTOOLS_RTF_SHPTXT " "); for (sal_Int32 n = 0; n < nPara; ++n) { if (n) @@ -720,7 +720,7 @@ void RtfSdrExport::EndShape(sal_Int32 nShapeElement) if (nShapeElement >= 0) { // end of the shape - m_rAttrOutput.RunText().append('}').append('}'); + m_rAttrOutput.RunText().append("}}"); } } |