loplugin:stringadd in basctl..cui

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

2 files changed, 32 insertions, 34 deletions

diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index 054e810ca084..0e25ae2f5da7 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -293,25 +293,25 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
 
 OString CppuOptions::prepareHelp()
 {
-    OString help("\nusing: ");
-    help += m_program + " [-options] file_1 ... file_n\nOptions:\n"
-            "    -O<path>   = path describes the root directory for the generated output.\n"
-            "                 The output directory tree is generated under this directory.\n"
-            "    -T<name>   = name specifies a type or a list of types. The output for this\n"
-            "      [t1;...]   type is generated. If no '-T' option is specified,\n"
-            "                 then output for all types is generated.\n"
-            "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n"
-            "    -L         = UNO type functions are generated lightweight, that means only\n"
-            "                 the name and typeclass are given and everything else is retrieved\n"
-            "                 from the type library dynamically. The default is that UNO type\n"
-            "                 functions provides enough type information for bootstrapping C++.\n"
-            "                 '-L' should be the default for external components.\n"
-            "    -C         = UNO type functions are generated comprehensive that means all\n"
-            "                 necessary information is available for bridging the type in UNO.\n"
-            "    -nD        = no dependent types are generated.\n"
-            "    -G         = generate only target files which does not exists.\n"
-            "    -Gc        = generate only target files which content will be changed.\n"
-            "    -X<file>   = extra types which will not be taken into account for generation.\n\n";
+    OString help = "\nusing: " +
+        m_program + " [-options] file_1 ... file_n\nOptions:\n"
+        "    -O<path>   = path describes the root directory for the generated output.\n"
+        "                 The output directory tree is generated under this directory.\n"
+        "    -T<name>   = name specifies a type or a list of types. The output for this\n"
+        "      [t1;...]   type is generated. If no '-T' option is specified,\n"
+        "                 then output for all types is generated.\n"
+        "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n"
+        "    -L         = UNO type functions are generated lightweight, that means only\n"
+        "                 the name and typeclass are given and everything else is retrieved\n"
+        "                 from the type library dynamically. The default is that UNO type\n"
+        "                 functions provides enough type information for bootstrapping C++.\n"
+        "                 '-L' should be the default for external components.\n"
+        "    -C         = UNO type functions are generated comprehensive that means all\n"
+        "                 necessary information is available for bridging the type in UNO.\n"
+        "    -nD        = no dependent types are generated.\n"
+        "    -G         = generate only target files which does not exists.\n"
+        "    -Gc        = generate only target files which content will be changed.\n"
+        "    -X<file>   = extra types which will not be taken into account for generation.\n\n";
     help += prepareVersion();
 
     return help;
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index 6338e9472aa0..4783087ecd0a 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -223,18 +223,18 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
 
 OString JavaOptions::prepareHelp()
 {
-    OString help("\nusing: ");
-    help += m_program + " [-options] file_1 ... file_n -Xfile_n+1 -Xfile_n+2\nOptions:\n"
-          "    -O<path>   = path describes the root directory for the generated output.\n"
-          "                 The output directory tree is generated under this directory.\n"
-          "    -T<name>   = name specifies a type or a list of types. The output for this\n"
-          "      [t1;...]   type and all dependent types are generated. If no '-T' option is\n"
-          "                 specified, then output for all types is generated.\n"
-          "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n"
-          "    -nD        = no dependent types are generated.\n"
-          "    -G         = generate only target files which does not exists.\n"
-          "    -Gc        = generate only target files which content will be changed.\n"
-          "    -X<file>   = extra types which will not be taken into account for generation.\n\n";
+    OString help = "\nusing: " +
+        m_program + " [-options] file_1 ... file_n -Xfile_n+1 -Xfile_n+2\nOptions:\n"
+        "    -O<path>   = path describes the root directory for the generated output.\n"
+        "                 The output directory tree is generated under this directory.\n"
+        "    -T<name>   = name specifies a type or a list of types. The output for this\n"
+        "      [t1;...]   type and all dependent types are generated. If no '-T' option is\n"
+        "                 specified, then output for all types is generated.\n"
+        "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n"
+        "    -nD        = no dependent types are generated.\n"
+        "    -G         = generate only target files which does not exists.\n"
+        "    -Gc        = generate only target files which content will be changed.\n"
+        "    -X<file>   = extra types which will not be taken into account for generation.\n\n";
     help += prepareVersion();
 
     return help;
@@ -242,9 +242,7 @@ OString JavaOptions::prepareHelp()
 
 OString JavaOptions::prepareVersion() const
 {
-    OString version(m_program);
-    version += " Version 2.0\n\n";
-    return version;
+    return m_program + " Version 2.0\n\n";
 }