loplugin:stringadd convert chained append to +

which can use the more efficient *StringConcat

Also fix a crash in stringview plugin which
started happening while I working on this.

Change-Id: I91a5b9b7707d1594d27d80b73930f5afac8ae608
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114568
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 25 insertions, 40 deletions

diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 48beab0039cd..c75d293b6f77 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -625,11 +625,11 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
         return rStream;
 
     OStringBuffer sOut;
-    sOut.append('<')
-        .append(OOO_STRING_SVTOOLS_HTML_map)
-        .append(' ')
-        .append(OOO_STRING_SVTOOLS_HTML_O_name)
-        .append("=\"");
+    sOut.append(OString::Concat("<") +
+            OOO_STRING_SVTOOLS_HTML_map
+            " "
+            OOO_STRING_SVTOOLS_HTML_O_name
+            "=\"");
     rStream.WriteOString( sOut.makeStringAndClear() );
     Out_String( rStream, rOutName, eDestEnc, pNonConvertableChars );
     rStream.WriteCharPtr( "\">" );
@@ -718,11 +718,11 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
                 if( pIndentArea )
                     rStream.WriteCharPtr( pIndentArea );
 
-                sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_area)
-                    .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_shape)
-                    .append('=').append(pShape).append(' ')
-                    .append(OOO_STRING_SVTOOLS_HTML_O_coords).append("=\"")
-                    .append(aCoords).append("\" ");
+                sOut.append(OString::Concat("<") + OOO_STRING_SVTOOLS_HTML_area
+                        " " OOO_STRING_SVTOOLS_HTML_O_shape
+                        "=" + pShape + " "
+                        OOO_STRING_SVTOOLS_HTML_O_coords "=\"" +
+                        aCoords + "\" ");
                 rStream.WriteOString( sOut.makeStringAndClear() );
 
                 OUString aURL( pObj->GetURL() );
@@ -730,7 +730,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
                 {
                     aURL = URIHelper::simpleNormalizedMakeRelative(
                         rBaseURL, aURL );
-                    sOut.append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"");
+                    sOut.append(OOO_STRING_SVTOOLS_HTML_O_href "=\"");
                     rStream.WriteOString( sOut.makeStringAndClear() );
                     Out_String( rStream, aURL, eDestEnc, pNonConvertableChars ).WriteChar( '\"' );
                 }
@@ -740,8 +740,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
                 const OUString& rObjName = pObj->GetName();
                 if( !rObjName.isEmpty() )
                 {
-                    sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
-                        .append("=\"");
+                    sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_name "=\"");
                     rStream.WriteOString( sOut.makeStringAndClear() );
                     Out_String( rStream, rObjName, eDestEnc, pNonConvertableChars ).WriteChar( '\"' );
                 }
@@ -749,8 +748,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
                 const OUString& rTarget = pObj->GetTarget();
                 if( !rTarget.isEmpty() && pObj->IsActive() )
                 {
-                    sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_target)
-                        .append("=\"");
+                    sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_target "=\"");
                     rStream.WriteOString( sOut.makeStringAndClear() );
                     Out_String( rStream, rTarget, eDestEnc, pNonConvertableChars ).WriteChar( '\"' );
                 }
@@ -761,8 +759,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
 
                 if( !rDesc.isEmpty() )
                 {
-                    sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt)
-                        .append("=\"");
+                    sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_alt "=\"");
                     rStream.WriteOString( sOut.makeStringAndClear() );
                     Out_String( rStream, rDesc, eDestEnc, pNonConvertableChars ).WriteChar( '\"' );
                 }
@@ -808,9 +805,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
 
     if( !rLanguage.isEmpty() )
     {
-        sOut.append(' ')
-            .append(OOO_STRING_SVTOOLS_HTML_O_language)
-            .append("=\"");
+        sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_language "=\"");
         rStrm.WriteOString( sOut.makeStringAndClear() );
         Out_String( rStrm, rLanguage, eDestEnc, pNonConvertableChars );
         sOut.append('\"');
@@ -818,7 +813,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
 
     if( !rSrc.isEmpty() )
     {
-        sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src).append("=\"");
+        sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_src "=\"");
         rStrm.WriteOString( sOut.makeStringAndClear() );
         Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(rBaseURL, rSrc), eDestEnc, pNonConvertableChars );
         sOut.append('\"');
@@ -826,8 +821,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
 
     if( STARBASIC != eScriptType && pSBLibrary )
     {
-        sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdlibrary)
-            .append("=\"");
+        sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_sdlibrary "=\"");
         rStrm.WriteOString( sOut.makeStringAndClear() );
         Out_String( rStrm, *pSBLibrary, eDestEnc, pNonConvertableChars );
         sOut.append('\"');
@@ -835,8 +829,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
 
     if( STARBASIC != eScriptType && pSBModule )
     {
-        sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdmodule)
-            .append("=\"");
+        sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_sdmodule "=\"");
         rStrm.WriteOString( sOut.makeStringAndClear() );
         Out_String( rStrm, *pSBModule, eDestEnc, pNonConvertableChars );
         sOut.append('\"');
@@ -860,19 +853,15 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
         {
             if( pSBLibrary )
             {
-                sOut.append("' ")
-                    .append(OOO_STRING_SVTOOLS_HTML_SB_library)
-                    .append(' ')
-                    .append(OUStringToOString(*pSBLibrary, eDestEnc));
+                sOut.append("' " OOO_STRING_SVTOOLS_HTML_SB_library " " +
+                            OUStringToOString(*pSBLibrary, eDestEnc));
                 rStrm.WriteOString( sOut.makeStringAndClear() ).WriteCharPtr( SAL_NEWLINE_STRING );
             }
 
             if( pSBModule )
             {
-                sOut.append("' ")
-                    .append(OOO_STRING_SVTOOLS_HTML_SB_module)
-                    .append(' ')
-                    .append(OUStringToOString(*pSBModule, eDestEnc));
+                sOut.append("' " OOO_STRING_SVTOOLS_HTML_SB_module " " +
+                        OUStringToOString(*pSBModule, eDestEnc));
                 rStrm.WriteOString( sOut.makeStringAndClear() ).WriteCharPtr( SAL_NEWLINE_STRING );
             }
         }
@@ -948,16 +937,12 @@ OString HTMLOutFuncs::CreateTableDataOptionsValNum(
         OUString aValStr;
         rFormatter.GetInputLineString( fVal, 0, aValStr );
         OString sTmp(OUStringToOString(aValStr, eDestEnc));
-        aStrTD.append(' ').
-            append(OOO_STRING_SVTOOLS_HTML_O_SDval).
-            append("=\"").
-            append(sTmp).append('\"');
+        aStrTD.append(" " OOO_STRING_SVTOOLS_HTML_O_SDval "=\"" +
+                sTmp + "\"");
     }
     if ( bValue || nFormat )
     {
-        aStrTD.append(' ').
-            append(OOO_STRING_SVTOOLS_HTML_O_SDnum).
-            append("=\"").
+        aStrTD.append(" " OOO_STRING_SVTOOLS_HTML_O_SDnum "=\"").
             append(static_cast<sal_Int32>(static_cast<sal_uInt16>(
                 Application::GetSettings().GetLanguageTag().getLanguageType()))).
             append(';'); // Language for Format 0