loplugin:stringadd in vcl

Change-Id: I21154abe6992418ff2541e5913a0aae0c2c1912c
Reviewed-on: https://gerrit.libreoffice.org/79987
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

11 files changed, 23 insertions, 35 deletions

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8ada1de6fe3a..74bb8fcd5219 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2130,8 +2130,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot
         }
         else if ( aPersona == "default" )
         {
-            gallery = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER;
-            gallery += "/gallery/personas/";
+            gallery = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/gallery/personas/";
         }
         rHeaderFooterBitmap = readBitmapEx( gallery + aName );
 
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index cb4f0c68ca5f..7ae57b9f62b7 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -251,9 +251,7 @@ namespace validation
             return true;
 
         // normalize the string
-        OUString sNormalized( "_" );
-        sNormalized += _rText;
-        sNormalized += "_";
+        OUString sNormalized = "_" + _rText + "_";
 
         return implValidateNormalized( sNormalized );
     }
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 28cebf73d2c3..c5ab8914eb17 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -218,8 +218,8 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString& familyName, FontFamil
     path += "/user/temp/embeddedfonts/fromsystem/";
     osl::Directory::createPath( path );
     OUString filename = familyName + "_" + OUString::number( family ) + "_" + OUString::number( italic )
-        + "_" + OUString::number( weight ) + "_" + OUString::number( pitch );
-    filename += ".ttf"; // TODO is it always ttf?
+        + "_" + OUString::number( weight ) + "_" + OUString::number( pitch )
+        + ".ttf"; // TODO is it always ttf?
     OUString url = path + filename;
     if( osl::File( url ).open( osl_File_OpenFlag_Read ) == osl::File::E_None ) // = exists()
     {
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index abfa1682e347..49c2ca9050b8 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -401,8 +401,8 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
         // how funny, an empty field name
         if( i_rControl.getType() == PDFWriter::RadioButton )
         {
-            aPartialName  = "RadioGroup";
-            aPartialName += OString::number( static_cast<const PDFWriter::RadioButtonWidget&>(i_rControl).RadioGroup );
+            aPartialName  = "RadioGroup" +
+                OString::number( static_cast<const PDFWriter::RadioButtonWidget&>(i_rControl).RadioGroup );
         }
         else
             aPartialName = OString( "Widget" );
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 6d85500b2884..5c1fb72ddc9e 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -105,8 +105,8 @@ OUString createPath(OUString const & name, sal_Int32 pos, OUString const & local
 
 OUString getIconCacheUrl(OUString const & sVariant, ImageRequestParameters const & rParameters)
 {
-    OUString sUrl("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/");
-    sUrl += rParameters.msStyle + "/" + sVariant + "/" + rParameters.msName;
+    OUString sUrl = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/cache/"
+        + rParameters.msStyle + "/" + sVariant + "/" + rParameters.msName;
     rtl::Bootstrap::expandMacros(sUrl);
     return sUrl;
 }
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 715fb4568e71..6a4234da3c19 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -230,11 +230,10 @@ namespace
         // get info about the graphic device
         static const OString aDeviceInfo (getDeviceInfoString());
 
-        OString aMessage;
-        aMessage += rPreamble;
-        aMessage += aVertexShaderSource;
-        aMessage += aFragmentShaderSource;
-        aMessage += aDeviceInfo;
+        OString aMessage = rPreamble +
+            aVertexShaderSource +
+            aFragmentShaderSource +
+            aDeviceInfo;
 
         return generateMD5(aMessage.getStr(), aMessage.getLength());
     }
@@ -309,8 +308,8 @@ namespace
     {
         OString aFileName;
         aFileName += getCacheFolder();
-        aFileName += OUStringToOString( rVertexShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
-        aFileName += OUStringToOString( rFragmentShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
+        aFileName += OUStringToOString( rVertexShaderName, RTL_TEXTENCODING_UTF8 ) + "-" +
+            OUStringToOString( rFragmentShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
         if (!rGeometryShaderName.isEmpty())
             aFileName += OUStringToOString( rGeometryShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
         aFileName += rDigest + ".bin";
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index afa7d8d4a501..614ee3dd19ec 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1984,8 +1984,7 @@ OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice,
                 nLastContent--;
 
             OUString aLastStr = aStr.copy(nLastContent);
-            OUString aTempLastStr1( "..." );
-            aTempLastStr1 += aLastStr;
+            OUString aTempLastStr1 = "..." + aLastStr;
             if ( _rLayout.GetTextWidth( aTempLastStr1, 0, aTempLastStr1.getLength() ) > nMaxWidth )
                 aStr = OutputDevice::ImplGetEllipsisString( rTargetDevice, aStr, nMaxWidth, nStyle | DrawTextFlags::EndEllipsis, _rLayout );
             else
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 36f049432114..baaae5211fbf 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -179,9 +179,7 @@ std::vector<std::unique_ptr<PrintFontManager::PrintFont>> PrintFontManager::anal
 
     OString aDir( getDirectory( nDirID ) );
 
-    OString aFullPath( aDir );
-    aFullPath += "/";
-    aFullPath += rFontFile;
+    OString aFullPath = aDir + "/" + rFontFile;
 
     // #i1872# reject unreadable files
     if( access( aFullPath.getStr(), R_OK ) )
@@ -912,9 +910,7 @@ OString PrintFontManager::getFontFile(const PrintFont* pFont) const
     if (pFont)
     {
         std::unordered_map< int, OString >::const_iterator it = m_aAtomToDir.find(pFont->m_nDirectory);
-        aPath = it->second;
-        aPath += "/";
-        aPath += pFont->m_aFontFile;
+        aPath = it->second + "/" + pFont->m_aFontFile;
     }
     return aPath;
 }
diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx
index bd34d34a5b83..834efc439422 100644
--- a/vcl/unx/generic/fontmanager/helper.cxx
+++ b/vcl/unx/generic/fontmanager/helper.cxx
@@ -140,8 +140,7 @@ void psp::getPrinterPathList( std::vector< OUString >& rPathList, const char* pS
 
         if( pSubDir )
         {
-            aDir += "/";
-            aDir += pSubDir;
+            aDir += OString("/") + pSubDir;
         }
         struct stat aStat;
         if( stat( aDir.getStr(), &aStat ) || ! S_ISDIR( aStat.st_mode ) )
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 104c5e04e091..1977a80b5e7f 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -511,9 +511,7 @@ void PrinterInfoManager::initialize()
     }
     for (auto const& printQueue : m_aSystemPrintQueues)
     {
-        OUString aPrinterName( "<" );
-        aPrinterName += printQueue.m_aQueue;
-        aPrinterName += ">";
+        OUString aPrinterName = "<" + printQueue.m_aQueue + ">";
 
         if( m_aPrinters.find( aPrinterName ) != m_aPrinters.end() )
             // probably user made this one permanent
@@ -570,8 +568,8 @@ FILE* PrinterInfoManager::startSpool( const OUString& rPrintername, bool bQuickC
     const PrinterInfo&   rPrinterInfo   = getPrinterInfo (rPrintername);
     const OUString& rCommand       = (bQuickCommand && !rPrinterInfo.m_aQuickCommand.isEmpty() ) ?
                                           rPrinterInfo.m_aQuickCommand : rPrinterInfo.m_aCommand;
-    OString aShellCommand  = OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1);
-    aShellCommand += " 2>/dev/null";
+    OString aShellCommand  = OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1) +
+        " 2>/dev/null";
 
     return popen (aShellCommand.getStr(), "w");
 }
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
index 2552bb16b253..d95f58035aad 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
@@ -1430,8 +1430,8 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection )
     {
         gchar *title;
         gtk_tree_model_get (model, &iter, 2, &title, -1);
-        aLabel += ": ";
-        aLabel += OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 );
+        aLabel += ": " +
+            OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 );
         g_free (title);
     }
     gtk_expander_set_label (GTK_EXPANDER (m_pFilterExpander),