loplugin:stringadd look for unnecessary temporaries

which defeat the *StringConcat optimisation.
Also make StringConcat conversions treat a nullptr as an empty string,
to match the O*String(char*) constructors.

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

2 files changed, 17 insertions, 17 deletions

diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index 0e25ae2f5da7..05c941b2c68a 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -76,7 +76,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
                             OString tmp("'-O', please check");
                             if (i <= ac - 1)
                             {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
+                                tmp += OStringLiteral(" your input '") + av[i+1] + "'";
                             }
 
                             throw IllegalArgument(tmp);
@@ -92,7 +92,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
                 case 'n':
                     if (av[i][2] != 'D' || av[i][3] != '\0')
                     {
-                        OString tmp = "'-nD', please check your input '" + OString(av[i]) + "'";
+                        OString tmp = OStringLiteral("'-nD', please check your input '") + av[i] + "'";
                         throw IllegalArgument(tmp);
                     }
 
@@ -111,7 +111,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
                             OString tmp("'-T', please check");
                             if (i <= ac - 1)
                             {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
+                                tmp += OStringLiteral(" your input '") + av[i+1] + "'";
                             }
 
                             throw IllegalArgument(tmp);
@@ -138,7 +138,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
                         OString tmp("'-L', please check");
                         if (i <= ac - 1)
                         {
-                            tmp += " your input '" + OString(av[i]) + "'";
+                            tmp += OStringLiteral(" your input '") + av[i] + "'";
                         }
 
                         throw IllegalArgument(tmp);
@@ -158,7 +158,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
                             OString tmp("'-CS', please check");
                             if (i <= ac - 1)
                             {
-                                tmp += " your input '" + OString(av[i]) + "'";
+                                tmp += OStringLiteral(" your input '") + av[i] + "'";
                             }
 
                             throw IllegalArgument(tmp);
@@ -176,7 +176,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
                         OString tmp("'-C', please check");
                         if (i <= ac - 1)
                         {
-                            tmp += " your input '" + OString(av[i]) + "'";
+                            tmp += OStringLiteral(" your input '") + av[i] + "'";
                         }
 
                         throw IllegalArgument(tmp);
@@ -196,7 +196,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
                             OString tmp("'-Gc', please check");
                             if (i <= ac - 1)
                             {
-                                tmp += " your input '" + OString(av[i]) + "'";
+                                tmp += OStringLiteral(" your input '") + av[i] + "'";
                             }
 
                             throw IllegalArgument(tmp);
@@ -210,7 +210,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
                         OString tmp("'-G', please check");
                         if (i <= ac - 1)
                         {
-                            tmp += " your input '" + OString(av[i]) + "'";
+                            tmp += OStringLiteral(" your input '") + av[i] + "'";
                         }
 
                         throw IllegalArgument(tmp);
@@ -232,7 +232,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
                             OString tmp("'-X', please check");
                             if (i <= ac - 1)
                             {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
+                                tmp += OStringLiteral(" your input '") + av[i+1] + "'";
                             }
 
                             throw IllegalArgument(tmp);
@@ -248,7 +248,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
                 }
 
                 default:
-                    throw IllegalArgument("the option is unknown" + OString(av[i]));
+                    throw IllegalArgument(OStringLiteral("the option is unknown") + av[i]);
             }
         } else
         {
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index 4783087ecd0a..795d1bbf8955 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -71,7 +71,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
                             OString tmp("'-O', please check");
                             if (i <= ac - 1)
                             {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
+                                tmp += OStringLiteral(" your input '") + av[i+1] + "'";
                             }
 
                             throw IllegalArgument(tmp);
@@ -86,7 +86,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
                 case 'n':
                     if (av[i][2] != 'D' || av[i][3] != '\0')
                     {
-                        OString tmp("'-nD', please check your input '" + OString(av[i]) + "'");
+                        OString tmp(OStringLiteral("'-nD', please check your input '") + av[i] + "'");
                         throw IllegalArgument(tmp);
                     }
 
@@ -104,7 +104,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
                             OString tmp("'-T', please check");
                             if (i <= ac - 1)
                             {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
+                                tmp += OStringLiteral(" your input '") + av[i+1] + "'";
                             }
 
                             throw IllegalArgument(tmp);
@@ -131,7 +131,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
                             OString tmp("'-Gc', please check");
                             if (i <= ac - 1)
                             {
-                                tmp += " your input '" + OString(av[i]) + "'";
+                                tmp += OStringLiteral(" your input '") + av[i] + "'";
                             }
 
                             throw IllegalArgument(tmp);
@@ -144,7 +144,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
                         OString tmp("'-G', please check");
                         if (i <= ac - 1)
                         {
-                            tmp += " your input '" + OString(av[i]) + "'";
+                            tmp += OStringLiteral(" your input '") + av[i] + "'";
                         }
 
                         throw IllegalArgument(tmp);
@@ -165,7 +165,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
                             OString tmp("'-X', please check");
                             if (i <= ac - 1)
                             {
-                                tmp += " your input '" + OString(av[i+1]) + "'";
+                                tmp += OStringLiteral(" your input '") + av[i+1] + "'";
                             }
 
                             throw IllegalArgument(tmp);
@@ -180,7 +180,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
                 }
 
                 default:
-                    throw IllegalArgument("the option is unknown" + OString(av[i]));
+                    throw IllegalArgument(OStringLiteral("the option is unknown") + av[i]);
             }
         } else
         {