New loplugin:stringconcat

Change-Id: Id7c517fb37bc28797c45fc0dde83e866f2aa4aac

4 files changed, 12 insertions, 14 deletions

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 231de700dd23..88d618cd288e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -535,7 +535,7 @@ static void aBasicErrorFunc(const OUString& rError, const OUString& rAction)
 
 static void initialize_uno(const OUString &aAppProgramURL)
 {
-    rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" + SAL_CONFIGFILE("soffice"));
+    rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" SAL_CONFIGFILE("soffice"));
 
     xContext = cppu::defaultBootstrap_InitialComponentContext();
     fprintf(stderr, "Uno initialized %d\n", xContext.is());
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 25a36260c713..888bb5ef875d 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -302,7 +302,7 @@ void JavaMigration::migrateJavarc()
         return;
 
     OUString sValue;
-    rtl::Bootstrap javaini(m_sUserDir + "/user/config/" + SAL_CONFIGFILE("java"));
+    rtl::Bootstrap javaini(m_sUserDir + "/user/config/" SAL_CONFIGFILE("java"));
     bool bSuccess = javaini.getFrom("Home", sValue);
     OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
                        "] XJob::execute: Could not get Home entry from java.ini/javarc.");
@@ -415,11 +415,11 @@ void SAL_CALL  JavaMigration::setPropertyValue(
             bool val;
             if (!(aValue >>= val))
                 throw MalformedDataException(
-                       OUString("[Service implementation ") + IMPL_NAME +
+                       "[Service implementation " IMPL_NAME
                        "] XLayerHandler::setPropertyValue received wrong type for Enable property", 0, Any());
             if (jfw_setEnabled(val) != JFW_E_NONE)
                 throw WrappedTargetException(
-                       OUString("[Service implementation ") + IMPL_NAME +
+                       "[Service implementation " IMPL_NAME
                        "] XLayerHandler::setPropertyValue: jfw_setEnabled failed.", 0, Any());
 
             break;
@@ -429,12 +429,12 @@ void SAL_CALL  JavaMigration::setPropertyValue(
              OUString cp;
              if (!(aValue >>= cp))
                  throw MalformedDataException(
-                           OUString("[Service implementation ") + IMPL_NAME +
+                           "[Service implementation " IMPL_NAME
                            "] XLayerHandler::setPropertyValue received wrong type for UserClassPath property", 0, Any());
 
              if (jfw_setUserClassPath(cp.pData) != JFW_E_NONE)
                  throw WrappedTargetException(
-                       OUString("[Service implementation ") +  IMPL_NAME +
+                       "[Service implementation " IMPL_NAME
                        "] XLayerHandler::setPropertyValue: jfw_setUserClassPath failed.", 0, Any());
              break;
          }
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index e11f09eb9f2e..04dcac8fccc7 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -268,8 +268,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
                         dp_misc::writeConsoleError(
                                  "\nERROR: unexpected option " +
                                  cmdArg +
-                                 "!\n" +
-                                 "       Use " + APP_NAME + " " +
+                                 "!\n       Use " APP_NAME " " +
                                  toString(info_help) +
                                  " to print all options.\n");
                         return 1;
@@ -537,14 +536,13 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
         {
             dp_misc::writeConsoleError(
                 "\nERROR: unknown sub-command " +
-                subCommand + "!\n" +
-                "       Use " + APP_NAME + " " +
+                subCommand + "!\n       Use " APP_NAME " " +
                 toString(info_help) + " to print all options.\n");
             return 1;
         }
 
         if (option_verbose)
-            dp_misc::writeConsole(OUString("\n") + APP_NAME + " done.\n");
+            dp_misc::writeConsole("\n" APP_NAME " done.\n");
         //Force to release all bridges which connect us to the child processes
         dp_misc::disposeBridges(xLocalComponentContext);
         return 0;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index a69bb1f635ab..199355ea7269 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -112,15 +112,15 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex )
     if (len == 2 && arg[ 1 ] == option_info->m_short_option)
     {
         ++(*pIndex);
-        dp_misc::TRACE(OUString(__FILE__) + ": identified option \'"
-            + "\'" + OUString( option_info->m_short_option ) + "\n");
+        dp_misc::TRACE(__FILE__ ": identified option \'\'"
+            + OUString( option_info->m_short_option ) + "\n");
         return true;
     }
     if (arg[ 1 ] == '-' && rtl_ustr_ascii_compare(
             arg.pData->buffer + 2, option_info->m_name ) == 0)
     {
         ++(*pIndex);
-        dp_misc::TRACE(OUString( __FILE__) + ": identified option \'"
+        dp_misc::TRACE(__FILE__ ": identified option \'"
             + OUString::createFromAscii(option_info->m_name) + "\'\n");
         return true;
     }