loplugin:stringadd in sd/sdext

when applying my upcoming patch to also consider O[U]StringBuffer

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

14 files changed, 272 insertions, 313 deletions

diff --git a/sd/source/console/PresenterToolBar.cxx b/sd/source/console/PresenterToolBar.cxx
index e05b0d44194b..5e7c770df208 100644
--- a/sd/source/console/PresenterToolBar.cxx
+++ b/sd/source/console/PresenterToolBar.cxx
@@ -1698,9 +1698,7 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime)
     const sal_Int32 nMinutes (sal::static_int_cast<sal_Int32>(rTime.Minutes));
     const sal_Int32 nSeconds(sal::static_int_cast<sal_Int32>(rTime.Seconds));
     // Hours
-    sText.append(nHours);
-
-    sText.append(":");
+    sText.append(OUString::number(nHours) + ":");
 
     // Minutes
     const OUString sMinutes (OUString::number(nMinutes));
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 7b1cd3a4b6a6..e5cf1951b4f4 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -629,11 +629,11 @@ void HtmlExport::ExportSingleDocument()
     mnPagesWritten = 0;
     InitProgress(mnSdPageCount);
 
-    OUStringBuffer aStr(gaHTMLHeader);
-    aStr.append(DocumentMetadata());
-    aStr.append("\r\n");
-    aStr.append("</head>\r\n");
-    aStr.append(CreateBodyTag());
+    OUStringBuffer aStr(gaHTMLHeader
+        + DocumentMetadata()
+        + "\r\n"
+        "</head>\r\n"
+        + CreateBodyTag());
 
     for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; ++nSdPage)
     {
@@ -655,8 +655,7 @@ void HtmlExport::ExportSingleDocument()
 
         lclAppendStyle(aStr, u"h1", sStyle);
 
-        aStr.append(sTitleText);
-        aStr.append("</h1>\r\n");
+        aStr.append(sTitleText + "</h1>\r\n");
 
         // write outline text
         aStr.append(CreateTextForPage( pOutliner, pPage, true, pPage->GetPageBackgroundColor() ));
@@ -669,11 +668,10 @@ void HtmlExport::ExportSingleDocument()
 
             if (!aNotesStr.isEmpty())
             {
-                aStr.append("<br>\r\n<h3>");
-                aStr.append(RESTOHTML(STR_HTMLEXP_NOTES));
-                aStr.append(":</h3>\r\n");
-
-                aStr.append(aNotesStr);
+                aStr.append("<br>\r\n<h3>"
+                    + RESTOHTML(STR_HTMLEXP_NOTES)
+                    + ":</h3>\r\n"
+                    + aNotesStr);
             }
         }
 
@@ -1089,13 +1087,13 @@ bool HtmlExport::CreateHtmlTextForPresPages()
         }
 
         // HTML head
-        OUStringBuffer aStr(gaHTMLHeader);
-        aStr.append(CreateMetaCharset());
-        aStr.append("  <title>");
-        aStr.append(StringToHTMLString(maPageNames[nSdPage]));
-        aStr.append("</title>\r\n");
-        aStr.append("</head>\r\n");
-        aStr.append(CreateBodyTag());
+        OUStringBuffer aStr(gaHTMLHeader
+            + CreateMetaCharset()
+            + "  <title>"
+            + StringToHTMLString(maPageNames[nSdPage])
+            + "</title>\r\n"
+            "</head>\r\n"
+            + CreateBodyTag());
 
         // navigation bar
         aStr.append(CreateNavBar(nSdPage, true));
@@ -1103,8 +1101,7 @@ bool HtmlExport::CreateHtmlTextForPresPages()
         // page title
         OUString sTitleText( CreateTextForTitle(pOutliner,pPage, pPage->GetPageBackgroundColor()) );
         lclAppendStyle(aStr, u"h1", getParagraphStyle(pOutliner, 0));
-        aStr.append(sTitleText);
-        aStr.append("</h1>\r\n");
+        aStr.append(sTitleText + "</h1>\r\n");
 
         // write outline text
         aStr.append(CreateTextForPage( pOutliner, pPage, true, pPage->GetPageBackgroundColor() ));
@@ -1117,11 +1114,10 @@ bool HtmlExport::CreateHtmlTextForPresPages()
 
             if (!aNotesStr.isEmpty())
             {
-                aStr.append("<br>\r\n<h3>");
-                aStr.append(RESTOHTML(STR_HTMLEXP_NOTES));
-                aStr.append(":</h3>\r\n");
-
-                aStr.append(aNotesStr);
+                aStr.append("<br>\r\n<h3>"
+                    + RESTOHTML(STR_HTMLEXP_NOTES)
+                    + ":</h3>\r\n"
+                    + aNotesStr);
             }
         }
 
@@ -1380,8 +1376,8 @@ OUString HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner,
             for (sal_Int32 nPara = 0; nPara < nCount; nPara++)
             {
                 lclAppendStyle(aStr, u"p", getParagraphStyle(pOutliner, nPara));
-                aStr.append(ParagraphToHTMLString(pOutliner, nPara, rBackgroundColor));
-                aStr.append("</p>\r\n");
+                aStr.append(ParagraphToHTMLString(pOutliner, nPara, rBackgroundColor)
+                    + "</p>\r\n");
             }
         }
     }
@@ -1601,17 +1597,16 @@ bool HtmlExport::CreateHtmlForPresPages()
             {
                 if( nSdPage < (mnSdPageCount-1) || bEndless )
                 {
-                    aStr.append("<meta http-equiv=\"refresh\" content=\"");
-                    aStr.append(fSecs);
-                    aStr.append("; URL=");
+                    aStr.append("<meta http-equiv=\"refresh\" content=\""
+                        + OUString::number(fSecs)
+                        + "; URL=");
 
                     int nPage = nSdPage + 1;
                     if( nPage == mnSdPageCount )
                         nPage = 0;
 
-                    aStr.append(maHTMLFiles[nPage]);
-
-                    aStr.append("\">\r\n");
+                    aStr.append(maHTMLFiles[nPage]
+                        + "\">\r\n");
                 }
             }
         }
@@ -1628,10 +1623,10 @@ bool HtmlExport::CreateHtmlForPresPages()
         if(!mbFrames )
             aStr.append(CreateNavBar(nSdPage, false));
         // Image
-        aStr.append("<center>");
-        aStr.append("<img src=\"");
-        aStr.append(maImageFiles[nSdPage]);
-        aStr.append("\" alt=\"\"");
+        aStr.append("<center>"
+            "<img src=\""
+            + maImageFiles[nSdPage]
+            + "\" alt=\"\"");
 
         if (!aClickableObjects.empty())
             aStr.append(" USEMAP=\"#map0\"");
@@ -1648,12 +1643,11 @@ bool HtmlExport::CreateHtmlForPresPages()
 
             if (!aNotesStr.isEmpty())
             {
-                aStr.append("<h3>");
-                aStr.append(RESTOHTML(STR_HTMLEXP_NOTES));
-                aStr.append(":</h3><br>\r\n\r\n<p>");
-
-                aStr.append(aNotesStr);
-                aStr.append("\r\n</p>\r\n");
+                aStr.append("<h3>"
+                    + RESTOHTML(STR_HTMLEXP_NOTES)
+                    + ":</h3><br>\r\n\r\n<p>"
+                    + aNotesStr
+                    + "\r\n</p>\r\n");
             }
         }
 
@@ -1897,21 +1891,20 @@ bool HtmlExport::CreateContentPage()
         SetDocColors();
 
     // html head
-    OUStringBuffer aStr(gaHTMLHeader);
-    aStr.append(CreateMetaCharset());
-    aStr.append("  <title>");
-    aStr.append(StringToHTMLString(maPageNames[0]));
-    aStr.append("</title>\r\n</head>\r\n");
-    aStr.append(CreateBodyTag());
+    OUStringBuffer aStr(
+        gaHTMLHeader
+        + CreateMetaCharset()
+        + "  <title>"
+        + StringToHTMLString(maPageNames[0])
+        + "</title>\r\n</head>\r\n"
+        + CreateBodyTag());
 
     // page head
     aStr.append("<center>\r\n");
 
     if(mbHeader)
     {
-        aStr.append("<h1>");
-        aStr.append(getDocumentTitle());
-        aStr.append("</h1><br>\r\n");
+        aStr.append("<h1>" + getDocumentTitle() + "</h1><br>\r\n");
     }
 
     aStr.append("<h2>");
@@ -1924,15 +1917,14 @@ bool HtmlExport::CreateContentPage()
         aStr.append(CreateLink(StringToHTMLString(maHTMLFiles[0]),
                                RESTOHTML(STR_HTMLEXP_CLICKSTART)));
 
-    aStr.append("</h2>\r\n</center>\r\n");
-
-    aStr.append("<center><table width=\"90%\"><tr>\r\n");
+    aStr.append("</h2>\r\n</center>\r\n"
+        "<center><table width=\"90%\"><tr>\r\n");
 
     // table of content
-    aStr.append("<td valign=\"top\" align=\"left\" width=\"25%\">\r\n");
-    aStr.append("<h3>");
-    aStr.append(RESTOHTML(STR_HTMLEXP_CONTENTS));
-    aStr.append("</h3>");
+    aStr.append("<td valign=\"top\" align=\"left\" width=\"25%\">\r\n"
+        "<h3>"
+        + RESTOHTML(STR_HTMLEXP_CONTENTS)
+        + "</h3>");
 
     for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
     {
@@ -1951,51 +1943,51 @@ bool HtmlExport::CreateContentPage()
 
     if (!maAuthor.isEmpty())
     {
-        aStr.append("<p><strong>");
-        aStr.append(RESTOHTML(STR_HTMLEXP_AUTHOR));
-        aStr.append(":</strong> ");
-        aStr.append(StringToHTMLString(maAuthor));
-        aStr.append("</p>\r\n");
+        aStr.append("<p><strong>"
+            + RESTOHTML(STR_HTMLEXP_AUTHOR)
+            + ":</strong> "
+            + StringToHTMLString(maAuthor)
+            + "</p>\r\n");
     }
 
     if (!maEMail.isEmpty())
     {
-        aStr.append("<p><strong>");
-        aStr.append(RESTOHTML(STR_HTMLEXP_EMAIL));
-        aStr.append(":</strong> <a href=\"mailto:");
-        aStr.append(maEMail);
-        aStr.append("\">");
-        aStr.append(StringToHTMLString(maEMail));
-        aStr.append("</a></p>\r\n");
+        aStr.append("<p><strong>"
+            + RESTOHTML(STR_HTMLEXP_EMAIL)
+            + ":</strong> <a href=\"mailto:"
+            + maEMail
+            + "\">"
+            + StringToHTMLString(maEMail)
+            + "</a></p>\r\n");
     }
 
     if (!maHomePage.isEmpty())
     {
-        aStr.append("<p><strong>");
-        aStr.append(RESTOHTML(STR_HTMLEXP_HOMEPAGE));
-        aStr.append(":</strong> <a href=\"");
-        aStr.append(maHomePage);
-        aStr.append("\">");
-        aStr.append(StringToHTMLString(maHomePage));
-        aStr.append("</a> </p>\r\n");
+        aStr.append("<p><strong>"
+            + RESTOHTML(STR_HTMLEXP_HOMEPAGE)
+            + ":</strong> <a href=\""
+            + maHomePage
+            + "\">"
+            + StringToHTMLString(maHomePage)
+            + "</a> </p>\r\n");
     }
 
     if (!maInfo.isEmpty())
     {
-        aStr.append("<p><strong>");
-        aStr.append(RESTOHTML(STR_HTMLEXP_INFO));
-        aStr.append(":</strong><br>\r\n");
-        aStr.append(StringToHTMLString(maInfo));
-        aStr.append("</p>\r\n");
+        aStr.append("<p><strong>"
+            + RESTOHTML(STR_HTMLEXP_INFO)
+            + ":</strong><br>\r\n"
+            + StringToHTMLString(maInfo)
+            + "</p>\r\n");
     }
 
     if(mbDownload)
     {
-        aStr.append("<p><a href=\"");
-        aStr.append(maDocFileName);
-        aStr.append("\">");
-        aStr.append(RESTOHTML(STR_HTMLEXP_DOWNLOAD));
-        aStr.append("</a></p>\r\n");
+        aStr.append("<p><a href=\""
+            + maDocFileName
+            + "\">"
+            + RESTOHTML(STR_HTMLEXP_DOWNLOAD)
+            + "</a></p>\r\n");
     }
 
     for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
@@ -2007,13 +1999,12 @@ bool HtmlExport::CreateContentPage()
             StringToHTMLString(maPageNames[nSdPage]) +
             "\">");
 
-        aStr.append(CreateLink(maHTMLFiles[nSdPage], aText));
-        aStr.append("\r\n");
+        aStr.append(CreateLink(maHTMLFiles[nSdPage], aText)
+            + "\r\n");
     }
 
-    aStr.append("</td></tr></table></center>\r\n");
-
-    aStr.append("</body>\r\n</html>");
+    aStr.append("</td></tr></table></center>\r\n"
+                "</body>\r\n</html>");
 
     bool bOk = WriteHtml(maIndex, false, aStr);
 
@@ -2037,12 +2028,12 @@ bool HtmlExport::CreateNotesPages()
             SetDocColors( pPage );
 
         // Html head
-        OUStringBuffer aStr(gaHTMLHeader);
-        aStr.append(CreateMetaCharset());
-        aStr.append("  <title>");
-        aStr.append(StringToHTMLString(maPageNames[0]));
-        aStr.append("</title>\r\n</head>\r\n");
-        aStr.append(CreateBodyTag());
+        OUStringBuffer aStr(gaHTMLHeader
+            + CreateMetaCharset()
+            + "  <title>"
+            + StringToHTMLString(maPageNames[0])
+            + "</title>\r\n</head>\r\n"
+            + CreateBodyTag());
 
         if(pPage)
             aStr.append(CreateTextForNotesPage( pOutliner, pPage, maBackColor ));
@@ -2076,12 +2067,12 @@ bool HtmlExport::CreateOutlinePages()
     for (sal_Int32 nPage = 0; nPage < (mbImpress?2:1) && bOk; ++nPage)
     {
         // Html head
-        OUStringBuffer aStr(gaHTMLHeader);
-        aStr.append(CreateMetaCharset());
-        aStr.append("  <title>");
-        aStr.append(StringToHTMLString(maPageNames[0]));
-        aStr.append("</title>\r\n</head>\r\n");
-        aStr.append(CreateBodyTag());
+        OUStringBuffer aStr(gaHTMLHeader
+            + CreateMetaCharset()
+            + "  <title>"
+            + StringToHTMLString(maPageNames[0])
+            + "</title>\r\n</head>\r\n"
+            + CreateBodyTag());
 
         SdrOutliner* pOutliner = mpDoc->GetInternalOutliner();
         for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
@@ -2097,8 +2088,8 @@ bool HtmlExport::CreateOutlinePages()
                 aTitle = maPageNames[nSdPage];
 
             lclAppendStyle(aStr, u"p", getParagraphStyle(pOutliner, 0));
-            aStr.append(CreateLink(aLink, aTitle));
-            aStr.append("</p>");
+            aStr.append(CreateLink(aLink, aTitle)
+                + "</p>");
 
             if(nPage==1)
             {
@@ -2273,18 +2264,18 @@ bool HtmlExport::CreateFrames()
     OUStringBuffer aStr(
         "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\"\r\n"
         "    \"http://www.w3.org/TR/html4/frameset.dtd\">\r\n"
-        "<html>\r\n<head>\r\n");
+        "<html>\r\n<head>\r\n"
 
-    aStr.append(CreateMetaCharset());
-    aStr.append("  <title>");
-    aStr.append(StringToHTMLString(maPageNames[0]));
-    aStr.append("</title>\r\n");
+        + CreateMetaCharset()
+        + "  <title>"
+        + StringToHTMLString(maPageNames[0])
+        + "</title>\r\n"
 
-    aStr.append("<script type=\"text/javascript\">\r\n<!--\r\n");
+        "<script type=\"text/javascript\">\r\n<!--\r\n"
 
-    aStr.append("var nCurrentPage = 0;\r\nvar nPageCount = ");
-    aStr.append(static_cast<sal_Int32>(mnSdPageCount));
-    aStr.append(";\r\n\r\n");
+        "var nCurrentPage = 0;\r\nvar nPageCount = "
+        + OUString::number(static_cast<sal_Int32>(mnSdPageCount))
+        + ";\r\n\r\n");
 
     OUString aFunction = JS_NavigateAbs;
 
@@ -2312,55 +2303,57 @@ bool HtmlExport::CreateFrames()
         aTmp = aTmp.replaceAll(aPlaceHolder, gaHTMLExtension);
         aStr.append(aTmp);
     }
-    aStr.append("// -->\r\n</script>\r\n");
+    aStr.append("// -->\r\n</script>\r\n"
 
-    aStr.append("</head>\r\n");
+        "</head>\r\n"
 
-    aStr.append("<frameset cols=\"*,");
-    aStr.append(static_cast<sal_Int32>(mnWidthPixel + 16));
-    aStr.append("\">\r\n");
+        "<frameset cols=\"*,"
+        + OUString::number(static_cast<sal_Int32>(mnWidthPixel + 16))
+        + "\">\r\n");
     if(mbImpress)
     {
-        aStr.append("  <frameset rows=\"42,*\">\r\n");
-        aStr.append("    <frame src=\"navbar3");
-        aStr.append(gaHTMLExtension);
-        aStr.append("\" name=\"navbar2\" marginwidth=\"4\" marginheight=\"4\" scrolling=\"no\">\r\n");
+        aStr.append(
+            "  <frameset rows=\"42,*\">\r\n"
+            "    <frame src=\"navbar3"
+            + gaHTMLExtension
+            + "\" name=\"navbar2\" marginwidth=\"4\" marginheight=\"4\" scrolling=\"no\">\r\n");
     }
-    aStr.append("    <frame src=\"outline0");
-    aStr.append(gaHTMLExtension);
-    aStr.append("\" name=\"outline\">\r\n");
+    aStr.append("    <frame src=\"outline0"
+        + gaHTMLExtension
+        + "\" name=\"outline\">\r\n");
     if(mbImpress)
         aStr.append("  </frameset>\r\n");
 
     if(mbNotes)
     {
-        aStr.append("  <frameset rows=\"42,");
-        aStr.append(static_cast<sal_Int32>(static_cast<double>(mnWidthPixel) * 0.75) + 16);
-        aStr.append(",*\">\r\n");
+        aStr.append("  <frameset rows=\"42,"
+            + OUString::number(static_cast<sal_Int32>(static_cast<double>(mnWidthPixel) * 0.75) + 16)
+            + ",*\">\r\n");
     }
     else
         aStr.append("  <frameset rows=\"42,*\">\r\n");
 
-    aStr.append("    <frame src=\"navbar0");
-    aStr.append(gaHTMLExtension);
-    aStr.append("\" name=\"navbar1\" marginwidth=\"4\" marginheight=\"4\" scrolling=\"no\">\r\n");
+    aStr.append(
+        "    <frame src=\"navbar0"
+        + gaHTMLExtension
+        + "\" name=\"navbar1\" marginwidth=\"4\" marginheight=\"4\" scrolling=\"no\">\r\n"
 
-    aStr.append("    <frame src=\"");
-    aStr.append(maHTMLFiles[0]);
-    aStr.append("\" name=\"show\" marginwidth=\"4\" marginheight=\"4\">\r\n");
+        "    <frame src=\""
+        + maHTMLFiles[0]
+        + "\" name=\"show\" marginwidth=\"4\" marginheight=\"4\">\r\n");
 
     if(mbNotes)
     {
-        aStr.append("    <frame src=\"note0");
-        aStr.append(gaHTMLExtension);
-        aStr.append("\" name=\"notes\">\r\n");
+        aStr.append("    <frame src=\"note0"
+            + gaHTMLExtension
+            + "\" name=\"notes\">\r\n");
     }
-    aStr.append("  </frameset>\r\n");
+    aStr.append("  </frameset>\r\n"
 
-    aStr.append("<noframes>\r\n");
-    aStr.append(CreateBodyTag());
-    aStr.append(RESTOHTML(STR_HTMLEXP_NOFRAMES));
-    aStr.append("\r\n</noframes>\r\n</frameset>\r\n</html>");
+        "<noframes>\r\n"
+        + CreateBodyTag()
+        + RESTOHTML(STR_HTMLEXP_NOFRAMES)
+        + "\r\n</noframes>\r\n</frameset>\r\n</html>");
 
     bool bOk = WriteHtml(maFramePage, false, aStr);
 
@@ -2390,13 +2383,14 @@ bool HtmlExport::CreateNavBarFrames()
 
     for( int nFile = 0; nFile < 3 && bOk; nFile++ )
     {
-        OUStringBuffer aStr(gaHTMLHeader);
-        aStr.append(CreateMetaCharset());
-        aStr.append("  <title>");
-        aStr.append(StringToHTMLString(maPageNames[0]));
-        aStr.append("</title>\r\n</head>\r\n");
-        aStr.append(CreateBodyTag());
-        aStr.append("<center>\r\n");
+        OUStringBuffer aStr(
+            gaHTMLHeader
+            + CreateMetaCharset()
+            + "  <title>"
+            + StringToHTMLString(maPageNames[0])
+            + "</title>\r\n</head>\r\n"
+            + CreateBodyTag()
+            + "<center>\r\n");
 
         // first page
         aButton = SdResId(STR_HTMLEXP_FIRSTPAGE);
@@ -2407,8 +2401,8 @@ bool HtmlExport::CreateNavBarFrames()
         if(nFile != 0 && mnSdPageCount > 1)
             aButton = CreateLink(u"JavaScript:parent.NavigateAbs(0)", aButton);
 
-        aStr.append(aButton);
-        aStr.append("\r\n");
+        aStr.append(aButton
+            + "\r\n");
 
         // to the previous page
         aButton = SdResId(STR_PUBLISH_BACK);
@@ -2420,8 +2414,8 @@ bool HtmlExport::CreateNavBarFrames()
         if(nFile != 0 && mnSdPageCount > 1)
             aButton = CreateLink(u"JavaScript:parent.NavigateRel(-1)", aButton);
 
-        aStr.append(aButton);
-        aStr.append("\r\n");
+        aStr.append(aButton
+            + "\r\n");
 
         // to the next page
         aButton = SdResId(STR_PUBLISH_NEXT);
@@ -2433,8 +2427,8 @@ bool HtmlExport::CreateNavBarFrames()
         if(nFile != 2 && mnSdPageCount > 1)
             aButton = CreateLink(u"JavaScript:parent.NavigateRel(1)", aButton);
 
-        aStr.append(aButton);
-        aStr.append("\r\n");
+        aStr.append(aButton
+            + "\r\n");
 
         // to the last page
         aButton = SdResId(STR_HTMLEXP_LASTPAGE);
@@ -2451,8 +2445,8 @@ bool HtmlExport::CreateNavBarFrames()
             aButton = CreateLink(aLink, aButton);
         }
 
-        aStr.append(aButton);
-        aStr.append("\r\n");
+        aStr.append(aButton
+            + "\r\n");
 
         // content
         if (mbContentsPage)
@@ -2462,8 +2456,8 @@ bool HtmlExport::CreateNavBarFrames()
                 aButton = CreateImage(GetButtonName(BTN_INDEX), aButton);
 
             // to the overview
-            aStr.append(CreateLink(maIndex, aButton, u"_top"));
-            aStr.append("\r\n");
+            aStr.append(CreateLink(maIndex, aButton, u"_top")
+                + "\r\n");
         }
 
         // text mode
@@ -2474,13 +2468,14 @@ bool HtmlExport::CreateNavBarFrames()
                 aButton = CreateImage(GetButtonName(BTN_TEXT), aButton);
 
             OUString aText0("text0" + gaHTMLExtension);
-            aStr.append(CreateLink(aText0, aButton, u"_top"));
-            aStr.append("\r\n");
+            aStr.append(CreateLink(aText0, aButton, u"_top")
+                + "\r\n");
         }
 
         // and finished...
-        aStr.append("</center>\r\n");
-        aStr.append("</body>\r\n</html>");
+        aStr.append(
+            "</center>\r\n"
+            "</body>\r\n</html>");
 
         OUString aFileName("navbar" + OUString::number(nFile));
 
@@ -2664,17 +2659,17 @@ OUString HtmlExport::CreateBodyTag() const
         if( (aTextColor == COL_AUTO) && (!maBackColor.IsDark()) )
             aTextColor = COL_BLACK;
 
-        aStr.append(" text=\"");
-        aStr.append(ColorToHTMLString( aTextColor ));
-        aStr.append("\" bgcolor=\"");
-        aStr.append(ColorToHTMLString( maBackColor ));
-        aStr.append("\" link=\"");
-        aStr.append(ColorToHTMLString( maLinkColor ));
-        aStr.append("\" vlink=\"");
-        aStr.append(ColorToHTMLString( maVLinkColor ));
-        aStr.append("\" alink=\"");
-        aStr.append(ColorToHTMLString( maALinkColor ));
-        aStr.append("\"");
+        aStr.append(" text=\""
+            + ColorToHTMLString( aTextColor )
+            + "\" bgcolor=\""
+            + ColorToHTMLString( maBackColor )
+            + "\" link=\""
+            + ColorToHTMLString( maLinkColor )
+            + "\" vlink=\""
+            + ColorToHTMLString( maVLinkColor )
+            + "\" alink=\""
+            + ColorToHTMLString( maALinkColor )
+            + "\"");
     }
 
     aStr.append(">\r\n");
@@ -2687,16 +2682,12 @@ OUString HtmlExport::CreateLink( std::u16string_view aLink,
                                  std::u16string_view aText,
                                  std::u16string_view aTarget )
 {
-    OUStringBuffer aStr( "<a href=\"" );
-    aStr.append(aLink);
+    OUStringBuffer aStr( OUString::Concat("<a href=\"") + aLink);
     if (!aTarget.empty())
     {
-        aStr.append("\" target=\"");
-        aStr.append(aTarget);
+        aStr.append(OUString::Concat("\" target=\"") + aTarget);
     }
-    aStr.append("\">");
-    aStr.append(aText);
-    aStr.append("</a>");
+    aStr.append(OUString::Concat("\">") + aText + "</a>");
 
     return aStr.makeStringAndClear();
 }
@@ -2704,15 +2695,11 @@ OUString HtmlExport::CreateLink( std::u16string_view aLink,
 // creates an image tag
 OUString HtmlExport::CreateImage( std::u16string_view aImage, std::u16string_view aAltText )
 {
-    OUStringBuffer aStr( "<img src=\"");
-    aStr.append(aImage);
-    aStr.append("\" border=0");
+    OUStringBuffer aStr( OUString::Concat("<img src=\"") + aImage + "\" border=0");
 
     if (!aAltText.empty())
     {
-        aStr.append(" alt=\"");
-        aStr.append(aAltText);
-        aStr.append('"');
+        aStr.append(OUString::Concat(" alt=\"") + aAltText + "\"");
     }
     else
     {
@@ -2944,11 +2931,12 @@ bool HtmlExport::CreateImageFileList()
     OUStringBuffer aStr;
     for( sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
     {
-        aStr.append(static_cast<sal_Int32>(nSdPage + 1));
-        aStr.append(';');
-        aStr.append(maURLPath);
-        aStr.append(maImageFiles[nSdPage]);
-        aStr.append("\r\n");
+        aStr.append(
+            OUString::number(static_cast<sal_Int32>(nSdPage + 1))
+            + ";"
+            + maURLPath
+            + maImageFiles[nSdPage]
+            + "\r\n");
     }
 
     bool bOk = WriteHtml("picture.txt", false, aStr);
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 8f9ab4c688a4..07a36e0eec98 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -745,8 +745,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode > const & xNode, con
             }
             else
             {
-                OUStringBuffer sBuffer;
-                sBuffer.append( "ppt_" );
+                OUStringBuffer sBuffer( "ppt_" );
                 switch( nEffectPresetClass )
                 {
                 case EffectPresetClass::ENTRANCE: sBuffer.append( "entrance_" ); break;
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index e6896d0d3014..5c5ad0b5ea67 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -664,12 +664,12 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
         sDisplay = sDisplay.replaceFirst( ";", "\\;" );
         sDisplay = sDisplay.replaceFirst( ",", "\\," );
         sDisplay = sDisplay.replaceFirst( ":", "\\:" );
-        sValue = sName + sDisplay ;
-        sValue.append(";page-number:");
-        sValue.append(static_cast<sal_Int32>(static_cast<sal_uInt16>((pDrViewSh->getCurrentPage()->GetPageNum()-1)>>1) + 1));
-        sValue.append(";total-pages:");
-        sValue.append(static_cast<sal_Int32>(pDrViewSh->GetPageTabControl().GetPageCount()));
-        sValue.append(";");
+        sValue = sName + sDisplay
+            + ";page-number:"
+            + OUString::number(static_cast<sal_Int32>(static_cast<sal_uInt16>((pDrViewSh->getCurrentPage()->GetPageNum()-1)>>1) + 1))
+            + ";total-pages:"
+            + OUString::number(static_cast<sal_Int32>(pDrViewSh->GetPageTabControl().GetPageCount()))
+            + ";";
         if(pDrViewSh->IsLayerModeActive() && pDrViewSh->GetLayerTabControl()) // #i87182#
         {
             sName = "page-name:";
@@ -695,12 +695,12 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
             sDisplay = sDisplay.replaceFirst( ";", "\\;" );
             sDisplay = sDisplay.replaceFirst( ",", "\\," );
             sDisplay = sDisplay.replaceFirst( ":", "\\:" );
-            sValue.append(sDisplay);
-            sValue.append(";page-number:");
-            sValue.append(static_cast<sal_Int32>(pDrViewSh->GetActiveTabLayerIndex()+1));
-            sValue.append(";total-pages:");
-            sValue.append(static_cast<sal_Int32>(pDrViewSh->GetLayerTabControl()->GetPageCount()));
-            sValue.append(";");
+            sValue.append(sDisplay
+                + ";page-number:"
+                + OUString::number(static_cast<sal_Int32>(pDrViewSh->GetActiveTabLayerIndex()+1))
+                + ";total-pages:"
+                + OUString::number(static_cast<sal_Int32>(pDrViewSh->GetLayerTabControl()->GetPageCount()))
+                + ";");
         }
     }
     if (auto pPresViewSh = dynamic_cast<::sd::PresentationViewShell* >(mpViewShell))
@@ -726,8 +726,8 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
                         strNote = strNote.replaceFirst( ";", "\\;" );
                         strNote = strNote.replaceFirst( ",", "\\," );
                         strNote = strNote.replaceFirst( ":", "\\:" );
-                        sValue.append(strNote);
-                        sValue.append(";");//to divide each paragraph
+                        sValue.append(strNote
+                            + ";");//to divide each paragraph
                     }
                 }
             }
@@ -745,12 +745,12 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
             sDisplay = sDisplay.replaceFirst( ";", "\\;" );
             sDisplay = sDisplay.replaceFirst( ",", "\\," );
             sDisplay = sDisplay.replaceFirst( ":", "\\:" );
-            sValue = "page-name:" + sDisplay;
-            sValue.append(";page-number:");
-            sValue.append(static_cast<sal_Int32>(static_cast<sal_uInt16>((pCurrPge->GetPageNum()-1)>>1) + 1));
-            sValue.append(";total-pages:");
-            sValue.append(static_cast<sal_Int32>(pDoc->GetSdPageCount(PageKind::Standard)));
-            sValue.append(";");
+            sValue = "page-name:" + sDisplay
+                + ";page-number:"
+                + OUString::number(static_cast<sal_Int32>(static_cast<sal_uInt16>((pCurrPge->GetPageNum()-1)>>1) + 1))
+                + ";total-pages:"
+                + OUString::number(static_cast<sal_Int32>(pDoc->GetSdPageCount(PageKind::Standard)))
+                + ";";
         }
     }
     if (sValue.getLength())
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 4fd911574abf..0a42649b1c85 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -711,8 +711,7 @@ OUString FrameworkHelper::ResourceIdToString (const Reference<XResourceId>& rxRe
             const Sequence<OUString> aAnchorURLs (rxResourceId->getAnchorURLs());
             for (const auto& rAnchorURL : aAnchorURLs)
             {
-                sString.append(" | ");
-                sString.append(rAnchorURL);
+                sString.append(" | " + rAnchorURL);
             }
         }
     }
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 492f51380e7b..8cd05154365c 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -215,8 +215,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
                 uno::Reference<text::XTextRange> xText (xServiceName, UNO_QUERY);
                 if (xText.is())
                 {
-                    aRet.append(xText->getString());
-                    aRet.append("<br/>");
+                    aRet.append(xText->getString() + "<br/>");
                 }
             }
             else
@@ -232,8 +231,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
                             aNotesPage->getByIndex(nIndex), UNO_QUERY);
                         if (xText.is())
                         {
-                            aRet.append(xText->getString());
-                            aRet.append("<br/>");
+                            aRet.append(xText->getString() + "<br/>");
                         }
                     }
                 }
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index b9201adea71d..65008effaa12 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1564,20 +1564,18 @@ void SdGenericDrawPage::getBackground( Any& )
 
 OUString SdGenericDrawPage::getBookmarkURL() const
 {
-    OUStringBuffer aRet;
+    OUString aRet;
     if( SvxFmDrawPage::mpPage )
     {
         OUString aFileName( static_cast<SdPage*>(SvxFmDrawPage::mpPage)->GetFileName() );
         if( !aFileName.isEmpty() )
         {
             const OUString aBookmarkName( SdDrawPage::getPageApiNameFromUiName( static_cast<SdPage*>(SvxFmDrawPage::mpPage)->GetBookmarkName() ) );
-            aRet.append( aFileName );
-            aRet.append( '#' );
-            aRet.append( aBookmarkName );
+            aRet = aFileName + "#" + aBookmarkName;
         }
     }
 
-    return aRet.makeStringAndClear();
+    return aRet;
 }
 
 void SdGenericDrawPage::setBookmarkURL( std::u16string_view rURL )
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index 71bc293aad23..1ff92deb73a4 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -64,8 +64,7 @@ void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties )
 {
     OSL_PRECOND(pTag,"Invalid tag string");
 
-    OUStringBuffer aElement;
-    aElement.append("<");
+    OUStringBuffer aElement("<");
     aElement.appendAscii(pTag);
     aElement.append(" ");
 
@@ -105,8 +104,7 @@ void OdfEmitter::write( const OUString& rText )
 
 void OdfEmitter::endTag( const char* pTag )
 {
-    OUStringBuffer aElement;
-    aElement.append("</");
+    OUStringBuffer aElement("</");
     aElement.appendAscii(pTag);
     aElement.append(">");
     write(aElement.makeStringAndClear());
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 9c9a269d6098..b1b7d9f86a58 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -950,11 +950,11 @@ bool PDFTrailer::emit( EmitContext& rWriteContext ) const
                    section_end->first == nLast+1 )
                 nLast = section_end->first;
             // write first object number and number of following entries
-            OStringBuffer aBuf( 21 );
-            aBuf.append( sal_Int32( section_begin->first ) );
-            aBuf.append( ' ' );
-            aBuf.append( sal_Int32(nLast - section_begin->first + 1) );
-            aBuf.append( "\r\n" );
+            OStringBuffer aBuf =
+                OString::number(sal_Int32( section_begin->first ) )
+                + " "
+                + OString::number(sal_Int32(nLast - section_begin->first + 1))
+                + "\r\n";
             if( ! rWriteContext.write( aBuf.getStr(), aBuf.getLength() ) )
                 return false;
             while( section_begin != section_end )
@@ -966,14 +966,12 @@ bool PDFTrailer::emit( EmitContext& rWriteContext ) const
                 int nPad = 10 - aOffset.getLength();
                 for( int i = 0; i < nPad; i++ )
                     aBuf.append( '0' );
-                aBuf.append( aOffset );
-                aBuf.append( ' ' );
+                aBuf.append( aOffset +  " " );
                 OString aGeneration( OString::number( section_begin->second.first ) );
                 nPad = 5 - aGeneration.getLength();
                 for( int i = 0; i < nPad; i++ )
                     aBuf.append( '0' );
-                aBuf.append( aGeneration );
-                aBuf.append( " n\r\n" );
+                aBuf.append( aGeneration + " n\r\n" );
                 if( ! rWriteContext.write( aBuf.getStr(), 20 ) )
                     return false;
                 ++section_begin;
diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx
index a923488d688d..c32e327c4c4f 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -110,15 +110,14 @@ void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties )
         pStream->write( "    ", 4, nWritten );
 
     OStringBuffer aBuf( 1024 );
-    aBuf.append( '<' );
-    aBuf.append( pTag );
+    aBuf.append( OString::Concat("<") + pTag );
     for( const auto& rProperty : rProperties )
     {
-        aBuf.append( ' ' );
-        aBuf.append( OUStringToOString( rProperty.first, RTL_TEXTENCODING_UTF8 ) );
-        aBuf.append( "=\"" );
-        aBuf.append( OUStringToOString( rProperty.second, RTL_TEXTENCODING_UTF8 ) );
-        aBuf.append( "\"" );
+        aBuf.append( " "
+            + OUStringToOString( rProperty.first, RTL_TEXTENCODING_UTF8 )
+            + "=\""
+            + OUStringToOString( rProperty.second, RTL_TEXTENCODING_UTF8 )
+            + "\"" );
     }
     aBuf.append( ">\n" );
     pStream->write( aBuf.getStr(), aBuf.getLength(), nWritten );
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index 86797056e841..c4d5b6bc0b71 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -378,17 +378,16 @@ static int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile*
         if( ! pStream )
             continue;
 
-        OStringBuffer aOutStream( i_pOutFile );
-        aOutStream.append( "_font_" );
-        aOutStream.append( sal_Int32(pStreamRef->m_nNumber) );
-        aOutStream.append( "_" );
-        aOutStream.append( sal_Int32(pStreamRef->m_nGeneration) );
-        aOutStream.append( "_" );
-        aOutStream.append( aFontName );
+        OStringBuffer aOutStream( OString::Concat(i_pOutFile)
+            + "_font_"
+            + OString::number( sal_Int32(pStreamRef->m_nNumber) )
+            + "_"
+            + OString::number( sal_Int32(pStreamRef->m_nGeneration) )
+            + "_"
+            + aFontName );
         if( pFileType )
         {
-            aOutStream.append( "." );
-            aOutStream.append( pFileType );
+            aOutStream.append( OString::Concat(".") + pFileType );
         }
         FileEmitContext aContext( aOutStream.getStr(), i_pInFile, i_pPDFFile );
         aContext.m_bDecrypt = i_pPDFFile->isEncrypted();
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index b94a302a5583..c1fa22d19100 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -221,8 +221,6 @@ void DrawXmlEmitter::fillFrameProps( DrawElement&       rElem,
     }
     else
     {
-        OUStringBuffer aBuf(256);
-
         basegfx::B2DHomMatrix mat(rGC.Transformation);
 
         if (rElem.MirrorVertical)
@@ -237,21 +235,21 @@ void DrawXmlEmitter::fillFrameProps( DrawElement&       rElem,
         double scale = convPx2mm(100);
         mat.scale(scale, scale);
 
-        aBuf.append("matrix(");
-        aBuf.append(mat.get(0, 0));
-        aBuf.append(' ');
-        aBuf.append(mat.get(1, 0));
-        aBuf.append(' ');
-        aBuf.append(mat.get(0, 1));
-        aBuf.append(' ');
-        aBuf.append(mat.get(1, 1));
-        aBuf.append(' ');
-        aBuf.append(mat.get(0, 2));
-        aBuf.append(' ');
-        aBuf.append(mat.get(1, 2));
-        aBuf.append(")");
-
-        rProps[ sDrawTransform ] = aBuf.makeStringAndClear();
+        rProps[ sDrawTransform ] =
+            OUString::Concat("matrix(")
+            + OUString::number(mat.get(0, 0))
+            + " "
+            + OUString::number(mat.get(1, 0))
+            + " "
+            + OUString::number(mat.get(0, 1))
+            + " "
+            + OUString::number(mat.get(1, 1))
+            + " "
+            + OUString::number(mat.get(0, 2))
+            + " "
+            + OUString::number(mat.get(1, 2))
+            + ")";
+
     }
 }
 
@@ -334,12 +332,11 @@ void DrawXmlEmitter::visit( PolyPolyElement& elem, const std::list< std::unique_
     // so we need to tell fillFrameProps here that the transformation for
     // a PolyPolyElement was already applied (aside from translation)
     fillFrameProps( elem, aProps, m_rEmitContext, true );
-    OUStringBuffer aBuf( 64 );
-    aBuf.append( "0 0 " );
-    aBuf.append( convPx2mmPrec2(elem.w)*100.0 );
-    aBuf.append( ' ' );
-    aBuf.append( convPx2mmPrec2(elem.h)*100.0 );
-    aProps[ "svg:viewBox" ] = aBuf.makeStringAndClear();
+    aProps[ "svg:viewBox" ] =
+        "0 0 "
+        + OUString::number( convPx2mmPrec2(elem.w)*100.0 )
+        + " "
+        + OUString::number( convPx2mmPrec2(elem.h)*100.0 );
     aProps[ "svg:d" ]       = basegfx::utils::exportToSvgD( elem.PolyPoly, false, true, false );
 
     m_rEmitContext.rEmitter.beginTag( "draw:path", aProps );
diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx
index b1cb02a489b3..fe93f2d7ed29 100644
--- a/sdext/source/pdfimport/tree/style.cxx
+++ b/sdext/source/pdfimport/tree/style.cxx
@@ -167,14 +167,12 @@ OUString StyleContainer::getStyleName( sal_Int32 nStyle ) const
             else
                 aStyleName = OStringToOUString( rStyle.Name, RTL_TEXTENCODING_ASCII_US );
             sal_Int32 nIndex = aStyleName.lastIndexOf( ':' );
-            aRet.append( aStyleName.subView(nIndex+1) );
-            aRet.append( nStyle );
+            aRet.append( aStyleName.subView(nIndex+1) + OUString::number( nStyle ) );
         }
     }
     else
     {
-        aRet.append( "invalid style id " );
-        aRet.append( nStyle );
+        aRet.append( "invalid style id " + OUString::number(nStyle) );
     }
 
     return aRet.makeStringAndClear();
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index f6c9df0805d5..a8331b87bfd2 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -254,28 +254,24 @@ void WriterXmlEmitter::fillFrameProps( DrawElement&       rElem,
         }
         if( fShearX != 0.0 )
         {
-            aBuf.append( "skewX( " );
-            aBuf.append( fShearX );
-            aBuf.append( " )" );
+            aBuf.append( "skewX( " + OUString::number(fShearX) + " )" );
         }
         if( fRotate != 0.0 )
         {
             if( !aBuf.isEmpty() )
                 aBuf.append( ' ' );
-            aBuf.append( "rotate( " );
-            aBuf.append( -fRotate );
-            aBuf.append( " )" );
+            aBuf.append( "rotate( " + OUString::number(-fRotate) + " )" );
 
         }
         if( ! rElem.isCharacter )
         {
             if( !aBuf.isEmpty() )
                 aBuf.append( ' ' );
-            aBuf.append( "translate( " );
-            aBuf.append( convertPixelToUnitString( rel_x ) );
-            aBuf.append( ' ' );
-            aBuf.append( convertPixelToUnitString( rel_y ) );
-            aBuf.append( " )" );
+            aBuf.append( "translate( "
+                + convertPixelToUnitString( rel_x )
+                + " "
+                + convertPixelToUnitString( rel_y )
+                + " )" );
         }
 
         rProps[ "draw:transform" ] = aBuf.makeStringAndClear();
@@ -358,12 +354,11 @@ void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< std::uniqu
 
     PropertyMap aProps;
     fillFrameProps( elem, aProps, m_rEmitContext );
-    OUStringBuffer aBuf( 64 );
-    aBuf.append( "0 0 " );
-    aBuf.append( convPx2mmPrec2(elem.w)*100.0 );
-    aBuf.append( ' ' );
-    aBuf.append( convPx2mmPrec2(elem.h)*100.0 );
-    aProps[ "svg:viewBox" ] = aBuf.makeStringAndClear();
+    aProps[ "svg:viewBox" ] =
+        "0 0 "
+        + OUString::number(convPx2mmPrec2(elem.w)*100.0)
+        + " "
+        + OUString::number( convPx2mmPrec2(elem.h)*100.0 );
     aProps[ "svg:d" ]       = basegfx::utils::exportToSvgD( elem.PolyPoly, true, true, false );
 
     m_rEmitContext.rEmitter.beginTag( "draw:path", aProps );
@@ -1113,10 +1108,7 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< std::un
         if( ! bIsCenter && elem.x > p_x + p_w/10 )
         {
             // indent
-            OUStringBuffer aBuf( 32 );
-            aBuf.append( convPx2mm( elem.x - p_x ) );
-            aBuf.append( "mm" );
-            aParaProps[ "fo:margin-left" ] = aBuf.makeStringAndClear();
+            aParaProps[ "fo:margin-left" ] = OUString::number(convPx2mm( elem.x - p_x )) + "mm";
         }
 
         // check whether to leave some space to next paragraph
@@ -1129,10 +1121,8 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< std::un
         {
             if( pNextPara->y - (elem.y+elem.h) > convmm2Px( 10 ) )
             {
-                OUStringBuffer aBuf( 32 );
-                aBuf.append( convPx2mm( pNextPara->y - (elem.y+elem.h) ) );
-                aBuf.append( "mm" );
-                aParaProps[ "fo:margin-bottom" ] = aBuf.makeStringAndClear();
+                aParaProps[ "fo:margin-bottom" ] =
+                    OUString::number( convPx2mm( pNextPara->y - (elem.y+elem.h) ) ) + "mm";
             }
         }
     }