ByteString->rtl::OStringBuffer

sw/source/filter/html/htmlbas.cxx

@@ -29,11 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <hintids.hxx>
-
+#include <rtl/strbuf.hxx>
 #include <sfx2/sfx.hrc>
-
 #define _SVSTDARR_STRINGSSORTDTOR
 #include <svl/svstdarr.hxx>
 #include <basic/sbx.hxx>
@@ -305,19 +303,17 @@ void SwHTMLWriter::OutBasic()
             if( 0==i && 0==j )
             {
                 OutNewLine();
-                ByteString sOut( '<' );
-                sOut.Append( OOO_STRING_SVTOOLS_HTML_meta );
-                sOut.Append( ' ' );
-                sOut.Append( OOO_STRING_SVTOOLS_HTML_O_httpequiv );
-                  sOut.Append( "=\"" );
-                sOut.Append( OOO_STRING_SVTOOLS_HTML_META_content_script_type );
-                sOut.Append( "\" " );
-                sOut.Append( OOO_STRING_SVTOOLS_HTML_O_content );
-                sOut.Append( "=\"text/x-" );
-                Strm() << sOut.GetBuffer();
+                rtl::OStringBuffer sOut;
+                sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta)
+                    .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_httpequiv)
+                    .append("=\"")
+                    .append(OOO_STRING_SVTOOLS_HTML_META_content_script_type)
+                    .append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content)
+                    .append("=\"text/x-");
+                Strm() << sOut.getStr();
                 // Entities aren't welcome here
-                ByteString sLang8( sLang, eDestEnc );
-                Strm() << sLang8.GetBuffer() << "\">";
+                Strm() << rtl::OUStringToOString(sLang, eDestEnc).getStr()
+                    << "\">";
             }
 
             const String& rModName = pModule->GetName();

sw/source/filter/html/htmlfly.cxx

@@ -456,14 +456,14 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
         if( bLFPossible && HTML_CNTNR_DIV == nCntnrMode )
             OutNewLine();
 
-        ByteString sOut( '<' );
+        rtl::OStringBuffer sOut;
         pCntnrStr = (HTML_CNTNR_DIV == nCntnrMode)
                             ? OOO_STRING_SVTOOLS_HTML_division
                             : OOO_STRING_SVTOOLS_HTML_span;
-        sOut += pCntnrStr;
-        ((((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_class) += "=\"")
-            += sCSS1_class_abs_pos) += '\"';
-        Strm() << sOut.GetBuffer();
+        sOut.append('<').append(pCntnrStr).append(' ')
+            .append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"")
+            .append(sCSS1_class_abs_pos).append('\"');
+        Strm() << sOut.makeStringAndClear().getStr();
 
         // Fuer Nicht-Zeichenobekte eine Breite ausgeben
         sal_uLong nFrmFlags = HTML_FRMOPTS_CNTNR;
@@ -1479,10 +1479,11 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
     if( rHTMLWrt.bLFPossible )
         rHTMLWrt.OutNewLine( sal_True );
 
-    ByteString sOut('<');
-    ((((sOut += OOO_STRING_SVTOOLS_HTML_spacer) += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=')
-        += OOO_STRING_SVTOOLS_HTML_SPTYPE_block;
-    rWrt.Strm() << sOut.GetBuffer();
+    rtl::OStringBuffer sOut;
+    sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_spacer).append(' ')
+        .append(OOO_STRING_SVTOOLS_HTML_O_type).append('=')
+        .append(OOO_STRING_SVTOOLS_HTML_SPTYPE_block);
+    rWrt.Strm() << sOut.makeStringAndClear().getStr();
 
     // ALIGN, WIDTH, HEIGHT
     ByteString aEndTags;
@@ -1517,10 +1518,10 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
     if( rHTMLWrt.bLFPossible )
         rHTMLWrt.OutNewLine();
 
-    ByteString sOut( '<' );
-    sOut += pStr;
+    rtl::OStringBuffer sOut;
+    sOut.append('<').append(pStr);
 
-    rWrt.Strm() << sOut.GetBuffer();
+    rWrt.Strm() << sOut.makeStringAndClear().getStr();
     ByteString aEndTags;
     sal_uLong nFrmFlags = HTML_FRMOPTS_DIV;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) )
@@ -1700,10 +1701,11 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 
     // als Multicol ausgeben
     rHTMLWrt.OutNewLine();
-    ByteString sOut( OOO_STRING_SVTOOLS_HTML_division );
-    ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=';
-    sOut += (bHeader ? "HEADER" : "FOOTER" );
-    HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.GetBuffer() );
+    rtl::OStringBuffer sOut;
+    sOut.append(OOO_STRING_SVTOOLS_HTML_division).append(' ')
+        .append(OOO_STRING_SVTOOLS_HTML_O_type).append('=')
+        .append(bHeader ? "HEADER" : "FOOTER");
+    HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.makeStringAndClear().getStr() );
 
     rHTMLWrt.IncIndentLevel();  // den Inhalt von Multicol einruecken;
 

sw/source/filter/html/htmlftn.cxx

@@ -28,12 +28,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
-
-
-
-
 #include <svtools/htmlout.hxx>
 #include <svtools/htmlkywd.hxx>
+#include <rtl/strbuf.hxx>
 #include <ndindex.hxx>
 #include <fmtftn.hxx>
 #include <txtftn.hxx>
@@ -42,7 +39,6 @@
 #include <ndtxt.hxx>
 #include <charfmt.hxx>
 
-
 #include "swhtml.hxx"
 #include "wrthtml.hxx"
 
@@ -319,21 +315,23 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
         rHTMLWrt.pFootEndNotes = new SwHTMLTxtFtns;
     rHTMLWrt.pFootEndNotes->Insert( pTxtFtn, nPos );
 
-    ByteString sOut( '<' );
-    (((sOut += OOO_STRING_SVTOOLS_HTML_anchor) += ' ') += OOO_STRING_SVTOOLS_HTML_O_class) += "=\"";
-    rWrt.Strm() << sOut.GetBuffer();
+    rtl::OStringBuffer sOut;
+    sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
+        .append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"");
+    rWrt.Strm() << sOut.makeStringAndClear().getStr();
     HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
-    ((sOut = "\" ") += OOO_STRING_SVTOOLS_HTML_O_name) += "=\"";
-    rWrt.Strm() << sOut.GetBuffer();
+    sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
+    rWrt.Strm() << sOut.makeStringAndClear().getStr();
     HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
-    (((sOut = OOO_STRING_SVTOOLS_HTML_FTN_anchor) += "\" ") += OOO_STRING_SVTOOLS_HTML_O_href) += "=\"#";
-    rWrt.Strm() << sOut.GetBuffer();
+    sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\" ")
+        .append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#");
+    rWrt.Strm() << sOut.makeStringAndClear().getStr();
     HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
-    (sOut = OOO_STRING_SVTOOLS_HTML_FTN_symbol)+= '\"';
+    sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append('\"');
     if( rFmtFtn.GetNumStr().Len() )
-        (sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_sdfixed;
-    sOut += '>';
-    rWrt.Strm() << sOut.GetBuffer();
+        sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed);
+    sOut.append('>');
+    rWrt.Strm() << sOut.makeStringAndClear().getStr();
     HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, sal_True );
 
     HTMLOutFuncs::Out_String( rWrt.Strm(), rFmtFtn.GetViewNumStr(*rWrt.pDoc),
@@ -377,9 +375,10 @@ void SwHTMLWriter::OutFootEndNotes()
 
         if( bLFPossible )
             OutNewLine();
-        ByteString sOut( '<' );
-        (((sOut += OOO_STRING_SVTOOLS_HTML_division) += ' ') += OOO_STRING_SVTOOLS_HTML_O_id) += "=\"";
-        Strm() << sOut.GetBuffer();
+        rtl::OStringBuffer sOut;
+        sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division)
+            .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id).append("=\"");
+        Strm() << sOut.makeStringAndClear().getStr();
         HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
         Strm() << "\">";
 
@@ -484,18 +483,20 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn,
         }
     }
 
-    ByteString sOut( '<' );
-    (((sOut += OOO_STRING_SVTOOLS_HTML_anchor) +=  ' ') += OOO_STRING_SVTOOLS_HTML_O_class) += "=\"";
-    Strm() << sOut.GetBuffer();
+    rtl::OStringBuffer sOut;
+    sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
+        .append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"");
+    Strm() << sOut.makeStringAndClear().getStr();
     HTMLOutFuncs::Out_String( Strm(), sClass, eDestEnc, &aNonConvertableCharacters );
-    ((sOut = "\" ") += OOO_STRING_SVTOOLS_HTML_O_name) += "=\"";
-    Strm() << sOut.GetBuffer();
+    sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
+    Strm() << sOut.makeStringAndClear().getStr();
     HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
-    (((sOut = OOO_STRING_SVTOOLS_HTML_FTN_symbol) +="\" ") += OOO_STRING_SVTOOLS_HTML_O_href) += "=\"#";
-    Strm() << sOut.GetBuffer();
+    sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append("\" ")
+        .append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#");
+    Strm() << sOut.makeStringAndClear().getStr();
     HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
-    (sOut = OOO_STRING_SVTOOLS_HTML_FTN_anchor) += "\">";
-    Strm() << sOut.GetBuffer();
+    sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\">");
+    Strm() << sOut.makeStringAndClear().getStr();
 
     HTMLOutFuncs::Out_String( Strm(), rNum, eDestEnc, &aNonConvertableCharacters );
     HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False );
@@ -560,11 +561,11 @@ void lcl_html_outFootEndNoteInfo( Writer& rWrt, String *pParts,
     }
 
     rHTMLWrt.OutNewLine();
-    ByteString sOut( '<' );
-    (((((((sOut += OOO_STRING_SVTOOLS_HTML_meta) +=  ' ')
-        += OOO_STRING_SVTOOLS_HTML_O_name) += "=\"") += pName) += "\" ")
-        += OOO_STRING_SVTOOLS_HTML_O_content) += "=\"";
-    rWrt.Strm() << sOut.GetBuffer();
+    rtl::OStringBuffer sOut;
+    sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta).append(' ')
+        .append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"").append(pName)
+        .append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content).append("=\"");
+    rWrt.Strm() << sOut.makeStringAndClear().getStr();
     HTMLOutFuncs::Out_String( rWrt.Strm(), aContent, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
     rWrt.Strm() << "\">";
 }

sw/source/filter/html/htmlplug.cxx

@@ -32,6 +32,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include "hintids.hxx"
+#include <rtl/strbuf.hxx>
 #include <svl/urihelper.hxx>
 #define _SVSTDARR_ULONGS
 #include <svl/svstdarr.hxx>
@@ -1028,11 +1029,12 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
                                   pMarkToOLE );
     uno::Any aAny;
     SvGlobalName aGlobName( xObj->getClassID() );
-    ByteString sOut('<');
+    rtl::OStringBuffer sOut;
+    sOut.append('<');
     if( aGlobName == SvGlobalName( SO3_PLUGIN_CLASSID ) )
     {
         // erstmal das Plug-spezifische
-        sOut += OOO_STRING_SVTOOLS_HTML_embed;
+        sOut.append(OOO_STRING_SVTOOLS_HTML_embed);
 
         ::rtl::OUString aStr;
         String aURL;
@@ -1045,27 +1047,29 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 
         if( aURL.Len() )
         {
-            ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_src) += "=\"";
-            rWrt.Strm() << sOut.GetBuffer();
+            sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src)
+                .append("=\"");
+            rWrt.Strm() << sOut.makeStringAndClear().getStr();
             HTMLOutFuncs::Out_String( rWrt.Strm(), aURL, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
-            sOut = '\"';
+            sOut.append('\"');
         }
 
         ::rtl::OUString aType;
         aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMimeType")) );
         if( (aAny >>= aType) && aType.getLength() )
         {
-            ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += "=\"";
-            rWrt.Strm() << sOut.GetBuffer();
+            sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type)
+                .append("=\"");
+            rWrt.Strm() << sOut.makeStringAndClear().getStr();
             HTMLOutFuncs::Out_String( rWrt.Strm(), aType, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
-            sOut = '\"';
+            sOut.append('\"');
         }
 
         if ((FLY_AT_PARA == rFrmFmt.GetAnchor().GetAnchorId()) &&
             SURROUND_THROUGHT == rFrmFmt.GetSurround().GetSurround() )
         {
             // Das Plugin ist HIDDEN
-            (sOut += ' ') += OOO_STRING_SW_HTML_O_Hidden;
+            sOut.append(' ').append(OOO_STRING_SW_HTML_O_Hidden);
             nFrmOpts = HTML_FRMOPTS_HIDDEN_EMBED;
             bHiddenEmbed = sal_True;
         }
@@ -1079,7 +1083,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     {
         // oder das Applet-Spezifische
 
-        sOut += OOO_STRING_SVTOOLS_HTML_applet;
+        sOut.append(OOO_STRING_SVTOOLS_HTML_applet);
 
         // CODEBASE
         ::rtl::OUString aCd;
@@ -1089,10 +1093,11 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
             String sCodeBase( URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(), aCd) );
             if( sCodeBase.Len() )
             {
-                ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_codebase) += "=\"";
-                rWrt.Strm() << sOut.GetBuffer();
+                sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_codebase)
+                    .append("=\"");
+                rWrt.Strm() << sOut.makeStringAndClear().getStr();
                 HTMLOutFuncs::Out_String( rWrt.Strm(), sCodeBase, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
-                sOut = '\"';
+                sOut.append('\"');
             }
         }
 
@@ -1100,10 +1105,11 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         ::rtl::OUString aClass;
         aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode")) );
         aAny >>= aClass;
-        ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_code) += "=\"";
-        rWrt.Strm() << sOut.GetBuffer();
+        sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_code)
+            .append("=\"");
+        rWrt.Strm() << sOut.makeStringAndClear().getStr();
         HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
-        sOut = '\"';
+        sOut.append('\"');
 
         // NAME
         ::rtl::OUString aAppletName;
@@ -1111,17 +1117,18 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         aAny >>= aAppletName;
         if( aAppletName.getLength() )
         {
-            ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\"";
-            rWrt.Strm() << sOut.GetBuffer();
+            sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
+                .append("=\"");
+            rWrt.Strm() << sOut.makeStringAndClear().getStr();
             HTMLOutFuncs::Out_String( rWrt.Strm(), aAppletName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
-            sOut = '\"';
+            sOut.append('\"');
         }
 
         sal_Bool bScript = sal_False;
         aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletIsScript")) );
         aAny >>= bScript;
         if( bScript )
-            (sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_mayscript;
+            sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_mayscript);
 
         nFrmOpts = bInCntnr ? HTML_FRMOPTS_APPLET_CNTNR
                             : HTML_FRMOPTS_APPLET;
@@ -1130,20 +1137,19 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     {
         // oder das Flating-Frame spezifische
 
-        sOut += OOO_STRING_SVTOOLS_HTML_iframe;
-        rWrt.Strm() << sOut.GetBuffer();
+        sOut.append(OOO_STRING_SVTOOLS_HTML_iframe);
+        rWrt.Strm() << sOut.makeStringAndClear().getStr();
 
         SfxFrameHTMLWriter::Out_FrameDescriptor( rWrt.Strm(), rWrt.GetBaseURL(),
                                         xSet,
                                         rHTMLWrt.eDestEnc,
                                         &rHTMLWrt.aNonConvertableCharacters );
-        sOut.Erase();
 
         nFrmOpts = bInCntnr ? HTML_FRMOPTS_IFRAME_CNTNR
                             : HTML_FRMOPTS_IFRAME;
     }
 
-    rWrt.Strm() << sOut.GetBuffer();
+    rWrt.Strm() << sOut.makeStringAndClear().getStr();
 
     // ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
@@ -1196,12 +1202,15 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
             const String& rName = rCommand.GetCommand();
             const String& rValue = rCommand.GetArgument();
             rHTMLWrt.OutNewLine();
-            ((((sOut = '<') += OOO_STRING_SVTOOLS_HTML_param) += ' ') += OOO_STRING_SVTOOLS_HTML_O_name)
-                += "=\"";
-            rWrt.Strm() << sOut.GetBuffer();
+            rtl::OStringBuffer sBuf;
+            sBuf.append('<').append(OOO_STRING_SVTOOLS_HTML_param)
+                .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
+                .append("=\"");
+            rWrt.Strm() << sBuf.makeStringAndClear().getStr();
             HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
-            ((sOut = "\" ") += OOO_STRING_SVTOOLS_HTML_O_value) += "=\"";
-            rWrt.Strm() << sOut.GetBuffer();
+            sBuf.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_value)
+                .append("=\"");
+            rWrt.Strm() << sBuf.makeStringAndClear().getStr();
             HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << "\">";
         }