Extend loplugin:elidestringvar to OString

(In VisitVarDecl, filtering out AbstractConditionalOperator avoids an unhelpful

> ~/lo/core/vcl/source/pdf/XmpMetadata.cxx:63:32: error: replace single use of literal 'rtl::OString' variable with a literal [loplugin:elidestringvar]
>             aXmlWriter.content(sPdfConformance);
>                                ^~~~~~~~~~~~~~~
> ~/lo/core/vcl/source/pdf/XmpMetadata.cxx:52:21: note: literal 'rtl::OString' variable defined here [loplugin:elidestringvar]
>             OString sPdfConformance = (mnPDF_A == 1) ? "A" : "B";
>             ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

)

Change-Id: I7d0410f04827d79b4b526752917c37d33cad2671
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104911
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

4 files changed, 53 insertions, 105 deletions

diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index c8a7ccce2a89..cfc73ca42dfb 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -211,9 +211,8 @@ namespace rtl_OStringBuffer
         void makeStringAndClear_001()
         {
             OStringBuffer   aStrBuf1;
-            OString         aStr1;
 
-            bool lastRes = (aStrBuf1.makeStringAndClear() ==  aStr1 );
+            bool lastRes = aStrBuf1.makeStringAndClear().isEmpty();
 
             CPPUNIT_ASSERT_MESSAGE
             (
@@ -236,9 +235,8 @@ namespace rtl_OStringBuffer
         void makeStringAndClear_002()
         {
             OStringBuffer   aStrBuf2(26);
-            OString         aStr2;
 
-            bool lastRes = (aStrBuf2.makeStringAndClear() == aStr2 );
+            bool lastRes = aStrBuf2.makeStringAndClear().isEmpty();
 
             CPPUNIT_ASSERT_MESSAGE
             (
@@ -975,7 +973,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[0] );
             sal_Int32              expVal1 = 0;
-            OString         expVal2;
             sal_Int32              expVal3 = 32;
             sal_Int32              input   = 0;
 
@@ -984,7 +981,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength equal to 0",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1035,7 +1032,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[1] );
             sal_Int32              expVal1 = 0;
-            OString         expVal2;
             sal_Int32              expVal3 = 17;
             sal_Int32              input   = 0;
 
@@ -1044,7 +1040,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength less than the length of OUStringBuffer(1)",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1055,7 +1051,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[2] );
             sal_Int32              expVal1 = 20;
-            OString         expVal2;
             sal_Int32              expVal3 = 20;
             sal_Int32              input   = 20;
 
@@ -1064,7 +1059,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength more than the capacity of OStringBuffer()",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1075,7 +1070,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[2] );
             sal_Int32              expVal1 = 3;
-            OString         expVal2;
             sal_Int32              expVal3 = 16;
             sal_Int32              input   = 3;
 
@@ -1084,7 +1078,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength more than the length of OStringBuffer()",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1095,7 +1089,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[2] );
             sal_Int32              expVal1 = 0;
-            OString         expVal2;
             sal_Int32              expVal3 = 16;
             sal_Int32              input   = 0;
 
@@ -1104,7 +1097,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength more than the length of OStringBuffer()",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1115,7 +1108,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[3] );
             sal_Int32              expVal1 = 20;
-            OString         expVal2;
             sal_Int32              expVal3 = 20;
             sal_Int32              input   = 20;
 
@@ -1124,7 +1116,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength more than the capacity of OStringBuffer("")",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1135,7 +1127,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[3] );
             sal_Int32              expVal1 = 5;
-            OString         expVal2;
             sal_Int32              expVal3 = 16;
             sal_Int32              input   = 5;
 
@@ -1144,7 +1135,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength more than the length of OStringBuffer("")",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1155,7 +1146,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[3] );
             sal_Int32              expVal1 = 0;
-            OString         expVal2;
             sal_Int32              expVal3 = 16;
             sal_Int32              input   = 0;
 
@@ -1164,7 +1154,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength less than the length of OStringBuffer("")",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1175,7 +1165,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[4] );
             sal_Int32              expVal1 = 20;
-            OString         expVal2;
             sal_Int32              expVal3 = 20;
             sal_Int32              input   = 20;
 
@@ -1184,7 +1173,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength more than the length of OStringBuffer(\0)",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1195,7 +1184,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[4] );
             sal_Int32              expVal1 = 5;
-            OString         expVal2;
             sal_Int32              expVal3 = 17;
             sal_Int32              input   = 5;
 
@@ -1204,7 +1192,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength more than the length of OStringBuffer(\0)",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1215,7 +1203,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[4] );
             sal_Int32              expVal1 = 0;
-            OString         expVal2;
             sal_Int32              expVal3 = 17;
             sal_Int32              input   = 0;
 
@@ -1224,7 +1211,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength less than the length of OStringBuffer(\0)",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1315,7 +1302,6 @@ namespace rtl_OStringBuffer
         {
             OStringBuffer   aStrBuf( arrOUS[5] );
             sal_Int32              expVal1 = 0;
-            OString         expVal2;
             sal_Int32              expVal3 = 48;
             sal_Int32              input   = 0;
 
@@ -1324,7 +1310,7 @@ namespace rtl_OStringBuffer
             CPPUNIT_ASSERT_MESSAGE
             (
                 "newLength equal to 0",
-                aStrBuf.getStr() == expVal2 &&
+                aStrBuf.getStr()[0] == '\0' &&
                     aStrBuf.getLength() == expVal1 &&
                     aStrBuf.getCapacity() == expVal3
             );
@@ -1443,6 +1429,8 @@ namespace rtl_OStringBuffer
     {
         OString arrOUS[5];
 
+        OString empty; // silence loplugin
+
     public:
         void setUp() override
         {
@@ -1508,9 +1496,8 @@ namespace rtl_OStringBuffer
         {
             OString                expVal( kTestStr7 );
             OStringBuffer   aStrBuf( arrOUS[0] );
-            OString                input2;
 
-            aStrBuf.append( input2 );
+            aStrBuf.append( empty );
 
             CPPUNIT_ASSERT_MESSAGE
             (
@@ -1576,9 +1563,8 @@ namespace rtl_OStringBuffer
         {
             OString                expVal;
             OStringBuffer   aStrBuf( arrOUS[1] );
-            OString                input2;
 
-            aStrBuf.append( input2 );
+            aStrBuf.append( empty );
 
             CPPUNIT_ASSERT_MESSAGE
             (
@@ -1644,9 +1630,8 @@ namespace rtl_OStringBuffer
         {
             OString                expVal;
             OStringBuffer   aStrBuf( arrOUS[2] );
-            OString                input2;
 
-            aStrBuf.append( input2 );
+            aStrBuf.append( empty );
 
             CPPUNIT_ASSERT_MESSAGE
             (
@@ -1712,9 +1697,8 @@ namespace rtl_OStringBuffer
         {
             OString                expVal;
             OStringBuffer   aStrBuf( arrOUS[3] );
-            OString                input2;
 
-            aStrBuf.append( input2 );
+            aStrBuf.append( empty );
 
             CPPUNIT_ASSERT_MESSAGE
             (
@@ -1780,9 +1764,8 @@ namespace rtl_OStringBuffer
         {
             OString                expVal( kTestStr28 );
             OStringBuffer   aStrBuf( arrOUS[4] );
-            OString                input2;
 
-            aStrBuf.append( input2 );
+            aStrBuf.append( empty );
 
             CPPUNIT_ASSERT_MESSAGE
             (
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index d890f924ddb1..3d27ba52c9c7 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -194,22 +194,16 @@ public:
     void testEqual()
     {
         {
-            OString aMsg1 = sSampleString;
-            OString aMsg2 = sSampleString;
-
-            OString aSum1 = getDigest(aMsg1, rtl_Digest_AlgorithmMD5);
-            OString aSum2 = getDigest(aMsg2, rtl_Digest_AlgorithmMD5);
+            OString aSum1 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5);
+            OString aSum2 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5);
 
             CPPUNIT_ASSERT_MESSAGE("md5sum must have a length", aSum1.getLength() == 32 && aSum2.getLength() == 32 );
             CPPUNIT_ASSERT_EQUAL_MESSAGE("source is the same, dest must be also the same", aSum1, aSum2);
         }
 
         {
-            OString aMsg1 = sSampleString;
-            OString aMsg2 = sSampleString_only_one_diff;
-
-            OString aSum1 = getDigest(aMsg1, rtl_Digest_AlgorithmMD5);
-            OString aSum2 = getDigest(aMsg2, rtl_Digest_AlgorithmMD5);
+            OString aSum1 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5);
+            OString aSum2 = getDigest(sSampleString_only_one_diff, rtl_Digest_AlgorithmMD5);
 
             CPPUNIT_ASSERT_MESSAGE("md5sum must have a length", aSum1.getLength() == 32 && aSum2.getLength() == 32 );
             CPPUNIT_ASSERT_MESSAGE("differ only in one char", aSum1 != aSum2);
@@ -380,13 +374,11 @@ public:
 
             std::unique_ptr<sal_uInt8[]> pResult(new sal_uInt8[RTL_DIGEST_LENGTH_SHA1]);
 
-            OString sExpected = "06f460d693aecdd3b5cbe8365408eccfc570f32a";
-
             rtl_digest_SHA1(aData, sizeof(aData), pResult.get(), RTL_DIGEST_LENGTH_SHA1);
 
             OString sKey = createHex(pResult.get(), RTL_DIGEST_LENGTH_SHA1);
 
-            CPPUNIT_ASSERT_EQUAL(sExpected, sKey);
+            CPPUNIT_ASSERT_EQUAL(OString("06f460d693aecdd3b5cbe8365408eccfc570f32a"), sKey);
         }
 
         // tdf#114939, verify that rtl_digest_SHA1 computes broken results for certain input (which
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index cbfdd800f1c3..516378dc14a7 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -296,65 +296,53 @@ public:
 
         void toDouble_test_3()
             {
-                OString sValue("3");
-                toDouble_test(sValue);
+                toDouble_test("3");
             }
         void toDouble_test_3_5()
             {
-                OString sValue("3.5");
-                toDouble_test(sValue);
+                toDouble_test("3.5");
             }
         void toDouble_test_3_0625()
             {
-                OString sValue("3.0625");
-                toDouble_test(sValue);
+                toDouble_test("3.0625");
             }
         void toDouble_test_pi()
             {
                 // value from http://www.angio.net/pi/digits/50.txt
-                OString sValue("3.141592653589793238462643383279502884197169399375");
-                toDouble_test(sValue);
+                toDouble_test("3.141592653589793238462643383279502884197169399375");
             }
 
         void toDouble_test_1()
             {
-                OString sValue("1");
-                toDouble_test(sValue);
+                toDouble_test("1");
             }
         void toDouble_test_10()
             {
-                OString sValue("10");
-                toDouble_test(sValue);
+                toDouble_test("10");
             }
         void toDouble_test_100()
             {
-                OString sValue("100");
-                toDouble_test(sValue);
+                toDouble_test("100");
             }
         void toDouble_test_1000()
             {
-                OString sValue("1000");
-                toDouble_test(sValue);
+                toDouble_test("1000");
             }
         void toDouble_test_10000()
             {
-                OString sValue("10000");
-                toDouble_test(sValue);
+                toDouble_test("10000");
             }
         void toDouble_test_1e99()
             {
-                OString sValue("1e99");
-                toDouble_test(sValue);
+                toDouble_test("1e99");
             }
         void toDouble_test_1e_n99()
             {
-                OString sValue("1e-99");
-                toDouble_test(sValue);
+                toDouble_test("1e-99");
             }
         void toDouble_test_1e308()
             {
-                OString sValue("1e308");
-                toDouble_test(sValue);
+                toDouble_test("1e308");
             }
 
         // Change the following lines only, if you add, remove or rename
@@ -424,75 +412,61 @@ public:
 
         void toFloat_test_3()
             {
-                OString sValue("3");
-                toFloat_test(sValue);
+                toFloat_test("3");
             }
         void toFloat_test_3_5()
             {
-                OString sValue("3.5");
-                toFloat_test(sValue);
+                toFloat_test("3.5");
             }
         void toFloat_test_3_0625()
             {
-                OString sValue("3.0625");
-                toFloat_test(sValue);
+                toFloat_test("3.0625");
             }
         void toFloat_test_3_0625_e()
             {
-                OString sValue("3.0625e-4");
-                toFloat_test(sValue);
+                toFloat_test("3.0625e-4");
             }
         void toFloat_test_pi()
             {
                 // value from http://www.angio.net/pi/digits/50.txt
-                OString sValue("3.141592653589793238462643383279502884197169399375");
-                toFloat_test(sValue);
+                toFloat_test("3.141592653589793238462643383279502884197169399375");
             }
 
         void toFloat_test_1()
             {
-                OString sValue("1");
-                toFloat_test(sValue);
+                toFloat_test("1");
             }
         void toFloat_test_10()
             {
-                OString sValue("10");
-                toFloat_test(sValue);
+                toFloat_test("10");
             }
         void toFloat_test_100()
             {
-                OString sValue("100");
-                toFloat_test(sValue);
+                toFloat_test("100");
             }
         void toFloat_test_1000()
             {
-                OString sValue("1000");
-                toFloat_test(sValue);
+                toFloat_test("1000");
             }
         void toFloat_test_10000()
             {
-                OString sValue("10000");
-                toFloat_test(sValue);
+                toFloat_test("10000");
             }
         void toFloat_test_mix()
             {
-                OString sValue("456789321455.123456789012");
-                toFloat_test(sValue);
+                toFloat_test("456789321455.123456789012");
             }
         void toFloat_test_1e99()
             {
-                OString sValue("1e99");
-                toFloat_test(sValue);
+                toFloat_test("1e99");
             }
         void toFloat_test_1e_n99()
             {
-                OString sValue("1e-9");
-                toFloat_test(sValue);
+                toFloat_test("1e-9");
             }
         void toFloat_test_1e308()
             {
-                OString sValue("1e308");
-                toFloat_test(sValue);
+                toFloat_test("1e308");
             }
 
         // Change the following lines only, if you add, remove or rename
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 81ec983450f5..1084926c65bb 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -47,8 +47,7 @@ namespace Stringtest
         void test_FromUTF8_001()
             {
                 // string --> ustring
-                OString sStrUTF8("h%C3%A4llo");
-                OUString suStrUTF8 = OStringToOUString(sStrUTF8, RTL_TEXTENCODING_ASCII_US);
+                OUString suStrUTF8 = OStringToOUString("h%C3%A4llo", RTL_TEXTENCODING_ASCII_US);
 
                 // UTF8 --> real ustring
                 OUString suStr_UriDecodeToIuri      = rtl::Uri::decode(suStrUTF8, rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);