Some loplugin:conststringvar/stringconstant improvements: sal

Change-Id: I8b5d81c2b51f846a24fd1f7f9cdd831f1ea54ea5

2 files changed, 53 insertions, 53 deletions

diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index b6b25113e797..dca9603f613c 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -35,61 +35,61 @@ static const rtl_TextEncoding kEncodingRTLTextUSASCII = RTL_TEXTENCODING_ASCII_U
 static const sal_uInt32 kConvertFlagsOUStringToOString = OUSTRING_TO_OSTRING_CVTFLAGS;
 static const sal_uInt32 kConvertFlagsOStringToOUString = OSTRING_TO_OUSTRING_CVTFLAGS;
 
-static const sal_Char *kTestStr1  = "Sun Microsystems";
-static const sal_Char *kTestStr2  = "Sun Microsystems Java Technology";
-static const sal_Char *kTestStr7  = "Sun ";
-static const sal_Char *kTestStr8  = "Microsystems";
-static const sal_Char *kTestStr14 = "   Sun Microsystems";
-static const sal_Char *kTestStr17 = "   Sun Microsystems   ";
-static const sal_Char *kTestStr23  = " Java Technology";
-static const sal_Char *kTestStr25 = "";
-static const sal_Char *kTestStr27 = "s";
-static const sal_Char *kTestStr28 = "\50\3\5\7\11\13\15\17sun";
-static const sal_Char *kTestStr29 = "\50\3\5\7\11\13\15\17sun\21\23\25\27\31\33\50";
-static const sal_Char *kTestStr31 = "sun Microsystems";
-static const sal_Char *kTestStr36 = "Microsystems Java Technology";
-static const sal_Char *kTestStr37 = "Sun  Java Technology";
-static const sal_Char *kTestStr38 = "\21\23\25\27\31\33\50";
-static const sal_Char *kTestStr39 = "\50\3\5\7\11\13\15\17sun   Sun Microsystems   ";
-static const sal_Char *kTestStr40 = "\50\3\5\7\11\13\15\17sunsun Microsystems";
-static const sal_Char *kTestStr45  = "Sun true";
-static const sal_Char *kTestStr46  = "Sun false";
-static const sal_Char *kTestStr47  = "true";
-static const sal_Char *kTestStr48  = "false";
-static const sal_Char *kTestStr49 = "\50\3\5\7\11\13\15\17suntrue";
-static const sal_Char *kTestStr50 = "\50\3\5\7\11\13\15\17sunfalse";
-static const sal_Char *kTestStr51  = "Sun M";
+static const sal_Char * const kTestStr1  = "Sun Microsystems";
+static const sal_Char * const kTestStr2  = "Sun Microsystems Java Technology";
+static const sal_Char * const kTestStr7  = "Sun ";
+static const sal_Char * const kTestStr8  = "Microsystems";
+static const sal_Char * const kTestStr14 = "   Sun Microsystems";
+static const sal_Char * const kTestStr17 = "   Sun Microsystems   ";
+static const sal_Char * const kTestStr23  = " Java Technology";
+static const sal_Char * const kTestStr25 = "";
+static const sal_Char * const kTestStr27 = "s";
+static const sal_Char * const kTestStr28 = "\50\3\5\7\11\13\15\17sun";
+static const sal_Char * const kTestStr29 = "\50\3\5\7\11\13\15\17sun\21\23\25\27\31\33\50";
+static const sal_Char * const kTestStr31 = "sun Microsystems";
+static const sal_Char * const kTestStr36 = "Microsystems Java Technology";
+static const sal_Char * const kTestStr37 = "Sun  Java Technology";
+static const sal_Char * const kTestStr38 = "\21\23\25\27\31\33\50";
+static const sal_Char * const kTestStr39 = "\50\3\5\7\11\13\15\17sun   Sun Microsystems   ";
+static const sal_Char * const kTestStr40 = "\50\3\5\7\11\13\15\17sunsun Microsystems";
+static const sal_Char * const kTestStr45  = "Sun true";
+static const sal_Char * const kTestStr46  = "Sun false";
+static const sal_Char * const kTestStr47  = "true";
+static const sal_Char * const kTestStr48  = "false";
+static const sal_Char * const kTestStr49 = "\50\3\5\7\11\13\15\17suntrue";
+static const sal_Char * const kTestStr50 = "\50\3\5\7\11\13\15\17sunfalse";
+static const sal_Char * const kTestStr51  = "Sun M";
 //static const sal_Char *kTestStr52  = "Sun \077777";
 //static const sal_Char *kTestStr53  = "Sun \100000";
 //static const sal_Char *kTestStr54  = "\77777";
 //static const sal_Char *kTestStr55  = "\100000";
-static const sal_Char *kTestStr56 = "\50\3\5\7\11\13\15\17suns";
+static const sal_Char * const kTestStr56 = "\50\3\5\7\11\13\15\17suns";
 //static const sal_Char *kTestStr57 = "\50\3\5\7\11\13\15\17sun\77777";
 //static const sal_Char *kTestStr58 = "\50\3\5\7\11\13\15\17sun\10000";
-static const sal_Char *kTestStr59  = "Sun 11";
-static const sal_Char *kTestStr60  = "11";
-static const sal_Char *kTestStr61  = "\50\3\5\7\11\13\15\17sun11";
-static const sal_Char *kTestStr62  = "Sun 0";
-static const sal_Char *kTestStr63  = "Sun -11";
-static const sal_Char *kTestStr64  = "Sun 2147483647";
-static const sal_Char *kTestStr65  = "Sun -2147483648";
-static const sal_Char *kTestStr66  = "0";
-static const sal_Char *kTestStr67  = "-11";
-static const sal_Char *kTestStr68  = "2147483647";
-static const sal_Char *kTestStr69  = "-2147483648";
-static const sal_Char *kTestStr70  = "\50\3\5\7\11\13\15\17sun0";
-static const sal_Char *kTestStr71  = "\50\3\5\7\11\13\15\17sun-11";
-static const sal_Char *kTestStr72  = "\50\3\5\7\11\13\15\17sun2147483647";
-static const sal_Char *kTestStr73  = "\50\3\5\7\11\13\15\17sun-2147483648";
-static const sal_Char *kTestStr116  = "Sun 9223372036854775807";
-static const sal_Char *kTestStr117  = "Sun -9223372036854775808";
-static const sal_Char *kTestStr118  = "9223372036854775807";
-static const sal_Char *kTestStr119  = "-9223372036854775808";
-static const sal_Char *kTestStr120  = "\50\3\5\7\11\13\15\17sun9223372036854775807";
-static const sal_Char *kTestStr121  = "\50\3\5\7\11\13\15\17sun-9223372036854775808";
-static const sal_Char *kTestStr143  = "Sun \377";
-static const sal_Char *kTestStr144  = "\377";
-static const sal_Char *kTestStr145 = "\50\3\5\7\11\13\15\17sun\377";
+static const sal_Char * const kTestStr59  = "Sun 11";
+static const sal_Char * const kTestStr60  = "11";
+static const sal_Char * const kTestStr61  = "\50\3\5\7\11\13\15\17sun11";
+static const sal_Char * const kTestStr62  = "Sun 0";
+static const sal_Char * const kTestStr63  = "Sun -11";
+static const sal_Char * const kTestStr64  = "Sun 2147483647";
+static const sal_Char * const kTestStr65  = "Sun -2147483648";
+static const sal_Char * const kTestStr66  = "0";
+static const sal_Char * const kTestStr67  = "-11";
+static const sal_Char * const kTestStr68  = "2147483647";
+static const sal_Char * const kTestStr69  = "-2147483648";
+static const sal_Char * const kTestStr70  = "\50\3\5\7\11\13\15\17sun0";
+static const sal_Char * const kTestStr71  = "\50\3\5\7\11\13\15\17sun-11";
+static const sal_Char * const kTestStr72  = "\50\3\5\7\11\13\15\17sun2147483647";
+static const sal_Char * const kTestStr73  = "\50\3\5\7\11\13\15\17sun-2147483648";
+static const sal_Char * const kTestStr116  = "Sun 9223372036854775807";
+static const sal_Char * const kTestStr117  = "Sun -9223372036854775808";
+static const sal_Char * const kTestStr118  = "9223372036854775807";
+static const sal_Char * const kTestStr119  = "-9223372036854775808";
+static const sal_Char * const kTestStr120  = "\50\3\5\7\11\13\15\17sun9223372036854775807";
+static const sal_Char * const kTestStr121  = "\50\3\5\7\11\13\15\17sun-9223372036854775808";
+static const sal_Char * const kTestStr143  = "Sun \377";
+static const sal_Char * const kTestStr144  = "\377";
+static const sal_Char * const kTestStr145 = "\50\3\5\7\11\13\15\17sun\377";
 
 static const sal_Int32 kTestStr1Len  = 16;
 static const sal_Int32 kTestStr2Len  = 32;
diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h
index 2c0b49679964..8f5c7463c261 100644
--- a/sal/qa/rtl/process/rtl_Process_Const.h
+++ b/sal/qa/rtl/process/rtl_Process_Const.h
@@ -27,10 +27,10 @@ extern "C"
 {
 #endif
 
-::rtl::OUString suParam0(RTL_CONSTASCII_USTRINGPARAM("-join"));
-::rtl::OUString suParam1(RTL_CONSTASCII_USTRINGPARAM("-with"));
-::rtl::OUString suParam2(RTL_CONSTASCII_USTRINGPARAM("-child"));
-::rtl::OUString suParam3(RTL_CONSTASCII_USTRINGPARAM("-process"));
+::rtl::OUString suParam0("-join");
+::rtl::OUString suParam1("-with");
+::rtl::OUString suParam2("-child");
+::rtl::OUString suParam3("-process");
 
 #ifdef __cplusplus
 }