loplugin:stringadd (clang-cl)

Change-Id: Icf2894f77c90aa4620910d621249947bad4be8b7
Reviewed-on: https://gerrit.libreoffice.org/82269
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

5 files changed, 12 insertions, 19 deletions

diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index 042d5fee6dfc..ef5c1a85995f 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -167,8 +167,7 @@ namespace connectivity
                 if (FAILED(pInterface->get_Item(OLEVariant(sStr), &pT)))
                 {
 #if OSL_DEBUG_LEVEL > 0
-                    OString sTemp("Unknown Item: ");
-                    sTemp += OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding());
+                    OString sTemp("Unknown Item: " + OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding()));
                     OSL_FAIL(sTemp.getStr());
 #endif
                 }
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index c3f81bfa5df5..8c98290b2125 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1427,9 +1427,9 @@ uno::Any SAL_CALL IUnknownWrapper::directInvoke( const OUString& aName, const un
                       "DISP_E_BADVARTYPE.", nullptr);
                 break;
             case DISP_E_EXCEPTION:
-                    message = "[automation bridge]: ";
-                    message += OUString(o3tl::toU(excepinfo.bstrDescription),
-                        ::SysStringLen(excepinfo.bstrDescription));
+                    message = "[automation bridge]: "
+                        + OUString(o3tl::toU(excepinfo.bstrDescription),
+                            ::SysStringLen(excepinfo.bstrDescription));
                     throw InvocationTargetException(message, Reference<XInterface>(), Any());
                     break;
             case DISP_E_MEMBERNOTFOUND:
@@ -2049,8 +2049,8 @@ Any  IUnknownWrapper::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
                   "DISP_E_BADVARTYPE.", nullptr);
             break;
         case DISP_E_EXCEPTION:
-                message = "[automation bridge]: ";
-                message += OUString(o3tl::toU(excepinfo.bstrDescription),
+                message = "[automation bridge]: "
+                    + OUString(o3tl::toU(excepinfo.bstrDescription),
                                     ::SysStringLen(excepinfo.bstrDescription));
 
                 throw InvocationTargetException(message, Reference<XInterface>(), Any());
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index beec4c1d6d3e..cce328d77052 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -825,8 +825,7 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR
             if( aText.startsWith("\\") && (aText.getLength() < 2 || aText[ 1 ] != '\\') )
             {
                 // cut to first segment
-                OUString aTmp = INetURLObject::GetScheme( eBaseProt );
-                aTmp += "/";
+                OUString aTmp = INetURLObject::GetScheme( eBaseProt ) + "/";
                 aTmp += aObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset );
                 aObj.SetURL( aTmp );
 
@@ -1889,8 +1888,7 @@ OUString URLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseURL )
             if( aText.startsWith("\\") && (aText.getLength() < 2 || aText[ 1 ] != '\\') )
             {
                 // cut to first segment
-                OUString aTmp = INetURLObject::GetScheme( eBaseProt );
-                aTmp += "/";
+                OUString aTmp = INetURLObject::GetScheme( eBaseProt ) + "/";
                 aTmp += aObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset );
                 aObj.SetURL( aTmp );
 
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index c8e3554d9fb9..d3e29c4eaad1 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2660,8 +2660,7 @@ uno::Any GetDBunoURI(const INetURLObject &rURL, DBConnURIType& rType)
     case DBConnURIType::MSJET:
 #ifdef _WIN32
     {
-        OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=");
-        sDBURL += rURL.PathToFileName();
+        OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=" + rURL.PathToFileName());
         aURLAny <<= sDBURL;
     }
 #endif
@@ -2669,8 +2668,7 @@ uno::Any GetDBunoURI(const INetURLObject &rURL, DBConnURIType& rType)
     case DBConnURIType::MSACE:
 #ifdef _WIN32
     {
-        OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=");
-        sDBURL += rURL.PathToFileName();
+        OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=" + rURL.PathToFileName());
         aURLAny <<= sDBURL;
     }
 #endif
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index b4e9d6db55c3..7dc85bcfddd7 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -649,8 +649,7 @@ void WinOpenGLDeviceInfo::GetData()
                         sizeof(value),
                         nullptr))
             {
-                OUString  driverKey("System\\CurrentControlSet\\Control\\Class\\");
-                driverKey += o3tl::toU(value);
+                OUString  driverKey(OUStringLiteral("System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
                 result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, o3tl::toW(driverKey.getStr()), 0, KEY_QUERY_VALUE, &key);
                 if (result == ERROR_SUCCESS)
                 {
@@ -737,8 +736,7 @@ void WinOpenGLDeviceInfo::GetData()
                             sizeof(value),
                             nullptr))
                 {
-                    OUString driverKey2("System\\CurrentControlSet\\Control\\Class\\");
-                    driverKey2 += o3tl::toU(value);
+                    OUString driverKey2(OUStringLiteral("System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
                     result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, o3tl::toW(driverKey2.getStr()), 0, KEY_QUERY_VALUE, &key);
                     if (result == ERROR_SUCCESS)
                     {