diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-11-19 17:32:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-11-19 21:19:40 +0100 |
| commit | 95ffa27c593a7fa31309b5e72a55d966862db9a0 (patch) | |
| tree | a1aa315c716375f7c40e36a96ec4fbabdc1cec12 /sal | |
| parent | 115e7a00c3ab2927b10e569e41d60230cba93dec (diff) | |
Extended loplugin:ostr: sal
Change-Id: Ic8a02784acb9f8981249689541bb6cba1b7fbfb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159682
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/file.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/unx/pipe.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 1346 | ||||
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 172 | ||||
| -rw-r--r-- | sal/qa/osl/process/osl_process.cxx | 6 | ||||
| -rw-r--r-- | sal/qa/rtl/cipher/rtl_cipher.cxx | 16 | ||||
| -rw-r--r-- | sal/qa/rtl/digest/rtl_digest.cxx | 136 | ||||
| -rw-r--r-- | sal/qa/rtl/ostring/rtl_str.cxx | 112 | ||||
| -rw-r--r-- | sal/qa/rtl/oustring/rtl_OUString2.cxx | 56 | ||||
| -rw-r--r-- | sal/qa/rtl/oustring/rtl_ustr.cxx | 22 | ||||
| -rw-r--r-- | sal/qa/rtl/strings/nonconstarray.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/rtl/strings/test_ostring.cxx | 42 | ||||
| -rw-r--r-- | sal/qa/rtl/strings/test_ostring_concat.cxx | 86 | ||||
| -rw-r--r-- | sal/qa/rtl/strings/test_oustring_concat.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/rtl/strings/test_strings_replace.cxx | 30 |
15 files changed, 1017 insertions, 1017 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index a831221a3c36..eeee7c803fd8 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -110,7 +110,7 @@ struct FileHandle_Impl rtl_String* m_memstreambuf; /*< used for in-memory streams */ #endif - explicit FileHandle_Impl(int fd, Kind kind = KIND_FD, OString path = "<anon>"); + explicit FileHandle_Impl(int fd, Kind kind = KIND_FD, OString path = "<anon>"_ostr); ~FileHandle_Impl(); static size_t getpagesize(); diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index 43f577ba8f44..4dfd75ddf662 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -136,7 +136,7 @@ getBootstrapSocketPath() { return OUStringToOString(pValue, RTL_TEXTENCODING_UTF8); } - return ""; + return ""_ostr; } static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions Options, diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index 0543db0112b3..9692d9fb2910 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -457,9 +457,9 @@ namespace rtl_OStringBuffer void setUp() override { arrOUS[0] = OString( kTestStr1 ); - arrOUS[1] = OString( "1" ); + arrOUS[1] = "1"_ostr; arrOUS[2] = OString( ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( "\0", 1 ); arrOUS[5] = OString( kTestStr2 ); @@ -582,9 +582,9 @@ namespace rtl_OStringBuffer void setUp() override { arrOUS[0] = OString( kTestStr1 ); - arrOUS[1] = OString( "1" ); + arrOUS[1] = "1"_ostr; arrOUS[2] = OString( ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( "\0", 1 ); arrOUS[5] = OString( kTestStr2 ); @@ -943,9 +943,9 @@ namespace rtl_OStringBuffer void setUp() override { arrOUS[0] = OString( kTestStr1 ); - arrOUS[1] = OString( "1" ); + arrOUS[1] = "1"_ostr; arrOUS[2] = OString( ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( "\0", 1 ); arrOUS[5] = OString( kTestStr2 ); @@ -1679,7 +1679,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -2167,7 +2167,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -2647,7 +2647,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -3126,7 +3126,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -3405,7 +3405,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -3682,7 +3682,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -3694,7 +3694,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3717,7 +3717,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 2; - expVal += OString( "100" ); + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3740,7 +3740,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 2; - expVal += OString( "1000" ); + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3763,7 +3763,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 2; - expVal += OString( "1111" ); + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3786,7 +3786,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3809,7 +3809,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 8; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3832,7 +3832,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 8; - expVal += OString( "10" ); + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3855,7 +3855,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 8; - expVal += OString( "17" ); + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3878,7 +3878,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3901,7 +3901,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 10; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3924,7 +3924,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 10; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3947,7 +3947,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 10; - expVal += OString( "15" ); + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3970,7 +3970,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -3993,7 +3993,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 16; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4016,7 +4016,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 16; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4039,7 +4039,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 16; - expVal += OString( "f" ); + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4062,7 +4062,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4085,7 +4085,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 36; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4108,7 +4108,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 36; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4131,7 +4131,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 35; sal_Int16 radix = 36; - expVal += OString( "z" ); + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4154,7 +4154,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4177,7 +4177,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 2; - expVal += OString( "100" ); + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4200,7 +4200,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 2; - expVal += OString( "1000" ); + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4223,7 +4223,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 2; - expVal += OString( "1111" ); + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4246,7 +4246,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4269,7 +4269,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 8; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4292,7 +4292,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 8; - expVal += OString( "10" ); + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4315,7 +4315,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 8; - expVal += OString( "17" ); + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4338,7 +4338,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4361,7 +4361,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 10; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4384,7 +4384,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 10; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4407,7 +4407,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 10; - expVal += OString( "15" ); + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4430,7 +4430,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4453,7 +4453,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 16; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4476,7 +4476,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 16; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4499,7 +4499,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 16; - expVal += OString( "f" ); + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4522,7 +4522,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4545,7 +4545,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 36; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4568,7 +4568,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 36; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4591,7 +4591,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 35; sal_Int16 radix = 36; - expVal += OString( "z" ); + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4614,7 +4614,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4637,7 +4637,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 2; - expVal += OString( "100" ); + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4660,7 +4660,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 2; - expVal += OString( "1000" ); + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4683,7 +4683,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 2; - expVal += OString( "1111" ); + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4706,7 +4706,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4729,7 +4729,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 8; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4752,7 +4752,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 8; - expVal += OString( "10" ); + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4775,7 +4775,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 8; - expVal += OString( "17" ); + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4798,7 +4798,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4821,7 +4821,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 10; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4844,7 +4844,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 10; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4867,7 +4867,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 10; - expVal += OString( "15" ); + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4890,7 +4890,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4913,7 +4913,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 16; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4936,7 +4936,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 16; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4959,7 +4959,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 16; - expVal += OString( "f" ); + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -4982,7 +4982,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5005,7 +5005,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 36; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5028,7 +5028,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 36; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5051,7 +5051,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 35; sal_Int16 radix = 36; - expVal += OString( "z" ); + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5074,7 +5074,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5097,7 +5097,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 2; - expVal += OString( "100" ); + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5120,7 +5120,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 2; - expVal += OString( "1000" ); + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5143,7 +5143,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 2; - expVal += OString( "1111" ); + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5166,7 +5166,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5189,7 +5189,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 8; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5212,7 +5212,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 8; - expVal += OString( "10" ); + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5235,7 +5235,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 8; - expVal += OString( "17" ); + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5258,7 +5258,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5281,7 +5281,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 10; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5304,7 +5304,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 10; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5327,7 +5327,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 10; - expVal += OString( "15" ); + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5350,7 +5350,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5373,7 +5373,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 16; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5396,7 +5396,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 16; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5419,7 +5419,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 16; - expVal += OString( "f" ); + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5442,7 +5442,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5465,7 +5465,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 36; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5488,7 +5488,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 36; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5511,7 +5511,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 35; sal_Int16 radix = 36; - expVal += OString( "z" ); + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5534,7 +5534,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5557,7 +5557,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 2; - expVal += OString( "100" ); + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5580,7 +5580,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 2; - expVal += OString( "1000" ); + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5603,7 +5603,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 2; - expVal += OString( "1111" ); + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5626,7 +5626,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5649,7 +5649,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 8; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5672,7 +5672,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 8; - expVal += OString( "10" ); + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5695,7 +5695,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 8; - expVal += OString( "17" ); + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5718,7 +5718,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5741,7 +5741,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 10; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5764,7 +5764,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 10; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5787,7 +5787,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 10; - expVal += OString( "15" ); + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5810,7 +5810,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5833,7 +5833,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 16; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5856,7 +5856,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 16; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5879,7 +5879,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 15; sal_Int16 radix = 16; - expVal += OString( "f" ); + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5902,7 +5902,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5925,7 +5925,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 4; sal_Int16 radix = 36; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5948,7 +5948,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 8; sal_Int16 radix = 36; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -5971,7 +5971,7 @@ namespace rtl_OStringBuffer sal_Int32 input = 35; sal_Int16 radix = 36; - expVal += OString( "z" ); + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6062,7 +6062,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -6073,7 +6073,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 2; - expVal += OString( "1111111" ); + expVal += "1111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6096,7 +6096,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 2; - expVal += OString( "1111111111111111111111111111111" ); + expVal += "1111111111111111111111111111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6119,7 +6119,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 8; - expVal += OString( "177" ); + expVal += "177"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6142,7 +6142,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 8; - expVal += OString( "17777777777" ); + expVal += "17777777777"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6165,7 +6165,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 10; - expVal += OString( "127" ); + expVal += "127"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6188,7 +6188,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 10; - expVal += OString( "2147483647" ); + expVal += "2147483647"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6211,7 +6211,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 16; - expVal += OString( "7f" ); + expVal += "7f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6234,7 +6234,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 16; - expVal += OString( "7fffffff" ); + expVal += "7fffffff"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6257,7 +6257,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 36; - expVal += OString( "3j" ); + expVal += "3j"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6280,7 +6280,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 36; - expVal += OString( "zik0zj" ); + expVal += "zik0zj"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6303,7 +6303,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 2; - expVal += OString( "1111111" ); + expVal += "1111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6326,7 +6326,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 2; - expVal += OString( "1111111111111111111111111111111" ); + expVal += "1111111111111111111111111111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6349,7 +6349,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 8; - expVal += OString( "177" ); + expVal += "177"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6372,7 +6372,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 8; - expVal += OString( "17777777777" ); + expVal += "17777777777"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6395,7 +6395,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 10; - expVal += OString( "127" ); + expVal += "127"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6418,7 +6418,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 10; - expVal += OString( "2147483647" ); + expVal += "2147483647"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6441,7 +6441,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 16; - expVal += OString( "7f" ); + expVal += "7f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6464,7 +6464,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 16; - expVal += OString( "7fffffff" ); + expVal += "7fffffff"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6487,7 +6487,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 36; - expVal += OString( "3j" ); + expVal += "3j"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6510,7 +6510,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 36; - expVal += OString( "zik0zj" ); + expVal += "zik0zj"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6533,7 +6533,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 2; - expVal += OString( "1111111" ); + expVal += "1111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6556,7 +6556,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 2; - expVal += OString( "1111111111111111111111111111111" ); + expVal += "1111111111111111111111111111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6579,7 +6579,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 8; - expVal += OString( "177" ); + expVal += "177"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6602,7 +6602,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 8; - expVal += OString( "17777777777" ); + expVal += "17777777777"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6625,7 +6625,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 10; - expVal += OString( "127" ); + expVal += "127"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6648,7 +6648,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 10; - expVal += OString( "2147483647" ); + expVal += "2147483647"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6671,7 +6671,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 16; - expVal += OString( "7f" ); + expVal += "7f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6694,7 +6694,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 16; - expVal += OString( "7fffffff" ); + expVal += "7fffffff"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6717,7 +6717,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 36; - expVal += OString( "3j" ); + expVal += "3j"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6740,7 +6740,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 36; - expVal += OString( "zik0zj" ); + expVal += "zik0zj"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6763,7 +6763,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 2; - expVal += OString( "1111111" ); + expVal += "1111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6786,7 +6786,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 2; - expVal += OString( "1111111111111111111111111111111" ); + expVal += "1111111111111111111111111111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6809,7 +6809,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 8; - expVal += OString( "177" ); + expVal += "177"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6832,7 +6832,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 8; - expVal += OString( "17777777777" ); + expVal += "17777777777"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6855,7 +6855,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 10; - expVal += OString( "127" ); + expVal += "127"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6878,7 +6878,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 10; - expVal += OString( "2147483647" ); + expVal += "2147483647"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6901,7 +6901,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 16; - expVal += OString( "7f" ); + expVal += "7f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6924,7 +6924,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 16; - expVal += OString( "7fffffff" ); + expVal += "7fffffff"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6947,7 +6947,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 36; - expVal += OString( "3j" ); + expVal += "3j"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6970,7 +6970,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 36; - expVal += OString( "zik0zj" ); + expVal += "zik0zj"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -6993,7 +6993,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 2; - expVal += OString( "1111111" ); + expVal += "1111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7016,7 +7016,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 2; - expVal += OString( "1111111111111111111111111111111" ); + expVal += "1111111111111111111111111111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7039,7 +7039,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 8; - expVal += OString( "177" ); + expVal += "177"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7062,7 +7062,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 8; - expVal += OString( "17777777777" ); + expVal += "17777777777"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7085,7 +7085,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 10; - expVal += OString( "127" ); + expVal += "127"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7108,7 +7108,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 10; - expVal += OString( "2147483647" ); + expVal += "2147483647"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7131,7 +7131,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 16; - expVal += OString( "7f" ); + expVal += "7f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7154,7 +7154,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 16; - expVal += OString( "7fffffff" ); + expVal += "7fffffff"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7177,7 +7177,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt8Max; sal_Int16 radix = 36; - expVal += OString( "3j" ); + expVal += "3j"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7200,7 +7200,7 @@ namespace rtl_OStringBuffer sal_Int32 input = kSInt32Max; sal_Int16 radix = 36; - expVal += OString( "zik0zj" ); + expVal += "zik0zj"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7266,7 +7266,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -7277,7 +7277,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7300,8 +7300,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "100" ); + expVal += "-"_ostr; + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7324,8 +7324,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1000" ); + expVal += "-"_ostr; + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7348,8 +7348,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1111" ); + expVal += "-"_ostr; + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7372,7 +7372,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7395,8 +7395,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7419,8 +7419,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "10" ); + expVal += "-"_ostr; + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7443,8 +7443,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "17" ); + expVal += "-"_ostr; + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7467,7 +7467,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7490,8 +7490,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7514,8 +7514,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7538,8 +7538,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "15" ); + expVal += "-"_ostr; + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7562,7 +7562,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7585,8 +7585,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7609,8 +7609,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7633,8 +7633,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "f" ); + expVal += "-"_ostr; + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7657,7 +7657,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7680,8 +7680,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7704,8 +7704,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7728,8 +7728,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -35; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "z" ); + expVal += "-"_ostr; + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7752,7 +7752,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7775,8 +7775,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "100" ); + expVal += "-"_ostr; + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7799,8 +7799,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1000" ); + expVal += "-"_ostr; + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7823,8 +7823,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1111" ); + expVal += "-"_ostr; + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7847,7 +7847,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7870,8 +7870,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7894,8 +7894,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "10" ); + expVal += "-"_ostr; + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7918,8 +7918,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "17" ); + expVal += "-"_ostr; + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7942,7 +7942,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7965,8 +7965,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -7989,8 +7989,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8013,8 +8013,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "15" ); + expVal += "-"_ostr; + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8037,7 +8037,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8060,8 +8060,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8084,8 +8084,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8108,8 +8108,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "f" ); + expVal += "-"_ostr; + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8132,7 +8132,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8155,8 +8155,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8179,8 +8179,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8203,8 +8203,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -35; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "z" ); + expVal += "-"_ostr; + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8227,7 +8227,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8250,8 +8250,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "100" ); + expVal += "-"_ostr; + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8274,8 +8274,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1000" ); + expVal += "-"_ostr; + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8298,8 +8298,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1111" ); + expVal += "-"_ostr; + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8322,7 +8322,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8345,8 +8345,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8369,8 +8369,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "10" ); + expVal += "-"_ostr; + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8393,8 +8393,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "17" ); + expVal += "-"_ostr; + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8417,7 +8417,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8440,8 +8440,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8464,8 +8464,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8488,8 +8488,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "15" ); + expVal += "-"_ostr; + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8512,7 +8512,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8535,8 +8535,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8559,8 +8559,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8583,8 +8583,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "f" ); + expVal += "-"_ostr; + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8607,7 +8607,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8630,8 +8630,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8654,8 +8654,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8678,8 +8678,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -35; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "z" ); + expVal += "-"_ostr; + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8702,7 +8702,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8725,8 +8725,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "100" ); + expVal += "-"_ostr; + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8749,8 +8749,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1000" ); + expVal += "-"_ostr; + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8773,8 +8773,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1111" ); + expVal += "-"_ostr; + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8797,7 +8797,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8820,8 +8820,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8844,8 +8844,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "10" ); + expVal += "-"_ostr; + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8868,8 +8868,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "17" ); + expVal += "-"_ostr; + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8892,7 +8892,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8915,8 +8915,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8939,8 +8939,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8963,8 +8963,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "15" ); + expVal += "-"_ostr; + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -8987,7 +8987,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9010,8 +9010,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9034,8 +9034,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9058,8 +9058,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "f" ); + expVal += "-"_ostr; + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9082,7 +9082,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9105,8 +9105,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9129,8 +9129,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9153,8 +9153,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -35; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "z" ); + expVal += "-"_ostr; + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9177,7 +9177,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9200,8 +9200,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "100" ); + expVal += "-"_ostr; + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9224,8 +9224,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1000" ); + expVal += "-"_ostr; + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9248,8 +9248,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1111" ); + expVal += "-"_ostr; + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9272,7 +9272,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9295,8 +9295,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9319,8 +9319,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "10" ); + expVal += "-"_ostr; + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9343,8 +9343,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "17" ); + expVal += "-"_ostr; + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9367,7 +9367,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9390,8 +9390,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9414,8 +9414,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9438,8 +9438,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "15" ); + expVal += "-"_ostr; + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9462,7 +9462,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9485,8 +9485,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9509,8 +9509,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9533,8 +9533,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -15; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "f" ); + expVal += "-"_ostr; + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9557,7 +9557,7 @@ namespace rtl_OStringBuffer sal_Int32 input = -0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9580,8 +9580,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -4; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9603,8 +9603,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -8; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9626,8 +9626,8 @@ namespace rtl_OStringBuffer sal_Int32 input = -35; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "z" ); + expVal += "-"_ostr; + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -9706,7 +9706,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -10373,7 +10373,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -10384,7 +10384,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10407,7 +10407,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 2; - expVal += OString( "100" ); + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10430,7 +10430,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 2; - expVal += OString( "1000" ); + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10453,7 +10453,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 2; - expVal += OString( "1111" ); + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10476,7 +10476,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10499,7 +10499,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 8; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10522,7 +10522,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 8; - expVal += OString( "10" ); + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10545,7 +10545,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 8; - expVal += OString( "17" ); + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10568,7 +10568,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10591,7 +10591,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 10; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10614,7 +10614,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 10; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10637,7 +10637,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 10; - expVal += OString( "15" ); + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10660,7 +10660,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10683,7 +10683,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 16; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10706,7 +10706,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 16; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10729,7 +10729,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 16; - expVal += OString( "f" ); + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10752,7 +10752,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10775,7 +10775,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 36; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10798,7 +10798,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 36; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10821,7 +10821,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 35; sal_Int16 radix = 36; - expVal += OString( "z" ); + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10844,7 +10844,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10867,7 +10867,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 2; - expVal += OString( "100" ); + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10890,7 +10890,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 2; - expVal += OString( "1000" ); + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10913,7 +10913,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 2; - expVal += OString( "1111" ); + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10936,7 +10936,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10959,7 +10959,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 8; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -10982,7 +10982,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 8; - expVal += OString( "10" ); + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11005,7 +11005,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 8; - expVal += OString( "17" ); + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11028,7 +11028,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11051,7 +11051,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 10; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11074,7 +11074,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 10; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11097,7 +11097,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 10; - expVal += OString( "15" ); + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11120,7 +11120,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11143,7 +11143,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 16; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11166,7 +11166,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 16; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11189,7 +11189,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 16; - expVal += OString( "f" ); + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11212,7 +11212,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11235,7 +11235,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 36; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11258,7 +11258,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 36; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11281,7 +11281,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 35; sal_Int16 radix = 36; - expVal += OString( "z" ); + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11304,7 +11304,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11327,7 +11327,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 2; - expVal += OString( "100" ); + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11350,7 +11350,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 2; - expVal += OString( "1000" ); + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11373,7 +11373,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 2; - expVal += OString( "1111" ); + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11396,7 +11396,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11419,7 +11419,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 8; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11442,7 +11442,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 8; - expVal += OString( "10" ); + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11465,7 +11465,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 8; - expVal += OString( "17" ); + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11488,7 +11488,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11511,7 +11511,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 10; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11534,7 +11534,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 10; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11557,7 +11557,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 10; - expVal += OString( "15" ); + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11580,7 +11580,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11603,7 +11603,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 16; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11626,7 +11626,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 16; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11649,7 +11649,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 16; - expVal += OString( "f" ); + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11672,7 +11672,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11695,7 +11695,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 36; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11718,7 +11718,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 36; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11741,7 +11741,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 35; sal_Int16 radix = 36; - expVal += OString( "z" ); + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11764,7 +11764,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11787,7 +11787,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 2; - expVal += OString( "100" ); + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11810,7 +11810,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 2; - expVal += OString( "1000" ); + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11833,7 +11833,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 2; - expVal += OString( "1111" ); + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11856,7 +11856,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11879,7 +11879,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 8; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11902,7 +11902,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 8; - expVal += OString( "10" ); + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11925,7 +11925,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 8; - expVal += OString( "17" ); + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11948,7 +11948,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11971,7 +11971,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 10; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -11994,7 +11994,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 10; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12017,7 +12017,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 10; - expVal += OString( "15" ); + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12040,7 +12040,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12063,7 +12063,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 16; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12086,7 +12086,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 16; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12109,7 +12109,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 16; - expVal += OString( "f" ); + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12132,7 +12132,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12155,7 +12155,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 36; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12178,7 +12178,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 36; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12201,7 +12201,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 35; sal_Int16 radix = 36; - expVal += OString( "z" ); + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12224,7 +12224,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12247,7 +12247,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 2; - expVal += OString( "100" ); + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12270,7 +12270,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 2; - expVal += OString( "1000" ); + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12293,7 +12293,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 2; - expVal += OString( "1111" ); + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12316,7 +12316,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12339,7 +12339,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 8; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12362,7 +12362,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 8; - expVal += OString( "10" ); + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12385,7 +12385,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 8; - expVal += OString( "17" ); + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12408,7 +12408,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12431,7 +12431,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 10; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12454,7 +12454,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 10; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12477,7 +12477,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 10; - expVal += OString( "15" ); + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12500,7 +12500,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12523,7 +12523,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 16; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12546,7 +12546,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 16; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12569,7 +12569,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 15; sal_Int16 radix = 16; - expVal += OString( "f" ); + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12592,7 +12592,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12615,7 +12615,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 4; sal_Int16 radix = 36; - expVal += OString( "4" ); + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12638,7 +12638,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 8; sal_Int16 radix = 36; - expVal += OString( "8" ); + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12661,7 +12661,7 @@ namespace rtl_OStringBuffer sal_Int64 input = 35; sal_Int16 radix = 36; - expVal += OString( "z" ); + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12752,7 +12752,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -12763,7 +12763,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 2; - expVal += OString( "1111111" ); + expVal += "1111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12786,7 +12786,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 2; - expVal += OString( "111111111111111111111111111111111111111111111111111111111111111" ); + expVal += "111111111111111111111111111111111111111111111111111111111111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12809,7 +12809,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 8; - expVal += OString( "177" ); + expVal += "177"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12832,7 +12832,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 8; - expVal += OString( "777777777777777777777" ); + expVal += "777777777777777777777"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12855,7 +12855,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 10; - expVal += OString( "127" ); + expVal += "127"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12878,7 +12878,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 10; - expVal += OString( "9223372036854775807" ); + expVal += "9223372036854775807"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12901,7 +12901,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 16; - expVal += OString( "7f" ); + expVal += "7f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12924,7 +12924,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 16; - expVal += OString( "7fffffffffffffff" ); + expVal += "7fffffffffffffff"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12947,7 +12947,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 36; - expVal += OString( "3j" ); + expVal += "3j"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12970,7 +12970,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 36; - expVal += OString( "1y2p0ij32e8e7" ); + expVal += "1y2p0ij32e8e7"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -12993,7 +12993,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 2; - expVal += OString( "1111111" ); + expVal += "1111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13016,7 +13016,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 2; - expVal += OString( "111111111111111111111111111111111111111111111111111111111111111" ); + expVal += "111111111111111111111111111111111111111111111111111111111111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13039,7 +13039,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 8; - expVal += OString( "177" ); + expVal += "177"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13062,7 +13062,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 8; - expVal += OString( "777777777777777777777" ); + expVal += "777777777777777777777"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13085,7 +13085,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 10; - expVal += OString( "127" ); + expVal += "127"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13108,7 +13108,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 10; - expVal += OString( "9223372036854775807" ); + expVal += "9223372036854775807"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13131,7 +13131,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 16; - expVal += OString( "7f" ); + expVal += "7f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13154,7 +13154,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 16; - expVal += OString( "7fffffffffffffff" ); + expVal += "7fffffffffffffff"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13177,7 +13177,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 36; - expVal += OString( "3j" ); + expVal += "3j"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13200,7 +13200,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 36; - expVal += OString( "1y2p0ij32e8e7" ); + expVal += "1y2p0ij32e8e7"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13223,7 +13223,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 2; - expVal += OString( "1111111" ); + expVal += "1111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13246,7 +13246,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 2; - expVal += OString( "111111111111111111111111111111111111111111111111111111111111111" ); + expVal += "111111111111111111111111111111111111111111111111111111111111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13269,7 +13269,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 8; - expVal += OString( "177" ); + expVal += "177"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13292,7 +13292,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 8; - expVal += OString( "777777777777777777777" ); + expVal += "777777777777777777777"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13315,7 +13315,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 10; - expVal += OString( "127" ); + expVal += "127"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13338,7 +13338,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 10; - expVal += OString( "9223372036854775807" ); + expVal += "9223372036854775807"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13361,7 +13361,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 16; - expVal += OString( "7f" ); + expVal += "7f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13384,7 +13384,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 16; - expVal += OString( "7fffffffffffffff" ); + expVal += "7fffffffffffffff"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13407,7 +13407,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 36; - expVal += OString( "3j" ); + expVal += "3j"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13430,7 +13430,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 36; - expVal += OString( "1y2p0ij32e8e7" ); + expVal += "1y2p0ij32e8e7"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13453,7 +13453,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 2; - expVal += OString( "1111111" ); + expVal += "1111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13476,7 +13476,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 2; - expVal += OString( "111111111111111111111111111111111111111111111111111111111111111" ); + expVal += "111111111111111111111111111111111111111111111111111111111111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13499,7 +13499,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 8; - expVal += OString( "177" ); + expVal += "177"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13522,7 +13522,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 8; - expVal += OString( "777777777777777777777" ); + expVal += "777777777777777777777"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13545,7 +13545,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 10; - expVal += OString( "127" ); + expVal += "127"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13568,7 +13568,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 10; - expVal += OString( "9223372036854775807" ); + expVal += "9223372036854775807"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13591,7 +13591,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 16; - expVal += OString( "7f" ); + expVal += "7f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13614,7 +13614,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 16; - expVal += OString( "7fffffffffffffff" ); + expVal += "7fffffffffffffff"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13637,7 +13637,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 36; - expVal += OString( "3j" ); + expVal += "3j"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13660,7 +13660,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 36; - expVal += OString( "1y2p0ij32e8e7" ); + expVal += "1y2p0ij32e8e7"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13683,7 +13683,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 2; - expVal += OString( "1111111" ); + expVal += "1111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13706,7 +13706,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 2; - expVal += OString( "111111111111111111111111111111111111111111111111111111111111111" ); + expVal += "111111111111111111111111111111111111111111111111111111111111111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13729,7 +13729,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 8; - expVal += OString( "177" ); + expVal += "177"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13752,7 +13752,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 8; - expVal += OString( "777777777777777777777" ); + expVal += "777777777777777777777"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13775,7 +13775,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 10; - expVal += OString( "127" ); + expVal += "127"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13798,7 +13798,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 10; - expVal += OString( "9223372036854775807" ); + expVal += "9223372036854775807"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13821,7 +13821,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 16; - expVal += OString( "7f" ); + expVal += "7f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13844,7 +13844,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 16; - expVal += OString( "7fffffffffffffff" ); + expVal += "7fffffffffffffff"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13867,7 +13867,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt8Max; sal_Int16 radix = 36; - expVal += OString( "3j" ); + expVal += "3j"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13890,7 +13890,7 @@ namespace rtl_OStringBuffer sal_Int64 input = kSInt64Max; sal_Int16 radix = 36; - expVal += OString( "1y2p0ij32e8e7" ); + expVal += "1y2p0ij32e8e7"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13956,7 +13956,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -13967,7 +13967,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -13990,8 +13990,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "100" ); + expVal += "-"_ostr; + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14014,8 +14014,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1000" ); + expVal += "-"_ostr; + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14038,8 +14038,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1111" ); + expVal += "-"_ostr; + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14062,7 +14062,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14085,8 +14085,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14109,8 +14109,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "10" ); + expVal += "-"_ostr; + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14133,8 +14133,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "17" ); + expVal += "-"_ostr; + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14157,7 +14157,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14180,8 +14180,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14204,8 +14204,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14228,8 +14228,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "15" ); + expVal += "-"_ostr; + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14252,7 +14252,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14275,8 +14275,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14299,8 +14299,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14323,8 +14323,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "f" ); + expVal += "-"_ostr; + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14347,7 +14347,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14370,8 +14370,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14394,8 +14394,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14418,8 +14418,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -35; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "z" ); + expVal += "-"_ostr; + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14442,7 +14442,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14465,8 +14465,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "100" ); + expVal += "-"_ostr; + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14489,8 +14489,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1000" ); + expVal += "-"_ostr; + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14513,8 +14513,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1111" ); + expVal += "-"_ostr; + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14537,7 +14537,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14560,8 +14560,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14584,8 +14584,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "10" ); + expVal += "-"_ostr; + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14608,8 +14608,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "17" ); + expVal += "-"_ostr; + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14632,7 +14632,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14655,8 +14655,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14679,8 +14679,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14703,8 +14703,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "15" ); + expVal += "-"_ostr; + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14727,7 +14727,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14750,8 +14750,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14774,8 +14774,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14798,8 +14798,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "f" ); + expVal += "-"_ostr; + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14822,7 +14822,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14845,8 +14845,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14869,8 +14869,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14893,8 +14893,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -35; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "z" ); + expVal += "-"_ostr; + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14917,7 +14917,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14940,8 +14940,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "100" ); + expVal += "-"_ostr; + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14964,8 +14964,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1000" ); + expVal += "-"_ostr; + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -14988,8 +14988,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1111" ); + expVal += "-"_ostr; + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15012,7 +15012,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15035,8 +15035,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15059,8 +15059,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "10" ); + expVal += "-"_ostr; + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15083,8 +15083,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "17" ); + expVal += "-"_ostr; + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15107,7 +15107,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15130,8 +15130,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15154,8 +15154,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15178,8 +15178,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "15" ); + expVal += "-"_ostr; + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15202,7 +15202,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15225,8 +15225,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15249,8 +15249,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15273,8 +15273,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "f" ); + expVal += "-"_ostr; + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15297,7 +15297,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15320,8 +15320,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15344,8 +15344,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15368,8 +15368,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -35; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "z" ); + expVal += "-"_ostr; + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15392,7 +15392,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15415,8 +15415,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "100" ); + expVal += "-"_ostr; + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15439,8 +15439,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1000" ); + expVal += "-"_ostr; + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15463,8 +15463,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1111" ); + expVal += "-"_ostr; + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15487,7 +15487,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15510,8 +15510,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15534,8 +15534,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "10" ); + expVal += "-"_ostr; + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15558,8 +15558,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "17" ); + expVal += "-"_ostr; + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15582,7 +15582,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15605,8 +15605,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15629,8 +15629,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15653,8 +15653,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "15" ); + expVal += "-"_ostr; + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15677,7 +15677,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15700,8 +15700,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15724,8 +15724,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15748,8 +15748,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "f" ); + expVal += "-"_ostr; + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15772,7 +15772,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15795,8 +15795,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15819,8 +15819,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15843,8 +15843,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -35; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "z" ); + expVal += "-"_ostr; + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15867,7 +15867,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 2; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15890,8 +15890,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "100" ); + expVal += "-"_ostr; + expVal += "100"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15914,8 +15914,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1000" ); + expVal += "-"_ostr; + expVal += "1000"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15938,8 +15938,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 2; - expVal += OString( "-" ); - expVal += OString( "1111" ); + expVal += "-"_ostr; + expVal += "1111"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15962,7 +15962,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 8; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -15985,8 +15985,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16009,8 +16009,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "10" ); + expVal += "-"_ostr; + expVal += "10"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16033,8 +16033,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 8; - expVal += OString( "-" ); - expVal += OString( "17" ); + expVal += "-"_ostr; + expVal += "17"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16057,7 +16057,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 10; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16080,8 +16080,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16104,8 +16104,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16128,8 +16128,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 10; - expVal += OString( "-" ); - expVal += OString( "15" ); + expVal += "-"_ostr; + expVal += "15"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16152,7 +16152,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 16; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16175,8 +16175,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16199,8 +16199,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16223,8 +16223,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -15; sal_Int16 radix = 16; - expVal += OString( "-" ); - expVal += OString( "f" ); + expVal += "-"_ostr; + expVal += "f"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16247,7 +16247,7 @@ namespace rtl_OStringBuffer sal_Int64 input = -0; sal_Int16 radix = 36; - expVal += OString( "0" ); + expVal += "0"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16270,8 +16270,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -4; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "4" ); + expVal += "-"_ostr; + expVal += "4"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16294,8 +16294,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -8; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "8" ); + expVal += "-"_ostr; + expVal += "8"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16318,8 +16318,8 @@ namespace rtl_OStringBuffer sal_Int64 input = -35; sal_Int16 radix = 36; - expVal += OString( "-" ); - expVal += OString( "z" ); + expVal += "-"_ostr; + expVal += "z"_ostr; aStrBuf.append( input, radix ); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -16399,7 +16399,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -17071,7 +17071,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -17641,7 +17641,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -18220,7 +18220,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } @@ -18274,7 +18274,7 @@ namespace rtl_OStringBuffer arrOUS[0] = OString( kTestStr7 ); arrOUS[1] = OString( ); arrOUS[2] = OString( kTestStr25 ); - arrOUS[3] = OString( "" ); + arrOUS[3] = ""_ostr; arrOUS[4] = OString( kTestStr28 ); } diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index cb38fb764cc9..be4a88178275 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -486,51 +486,51 @@ namespace osl_FileBase void getAbsoluteFileURL::getAbsoluteFileURL_001_1() { OUString suAssume = aUserDirectoryURL + "/relative/file1"; - check_getAbsoluteFileURL(aUserDirectoryURL, "relative/file1",osl::FileBase::E_None, suAssume); + check_getAbsoluteFileURL(aUserDirectoryURL, "relative/file1"_ostr,osl::FileBase::E_None, suAssume); } void getAbsoluteFileURL::getAbsoluteFileURL_001_2() { OUString suAssume = aUserDirectoryURL + "/relative/file2"; - check_getAbsoluteFileURL(aUserDirectoryURL, "relative/./file2",osl::FileBase::E_None, suAssume); + check_getAbsoluteFileURL(aUserDirectoryURL, "relative/./file2"_ostr,osl::FileBase::E_None, suAssume); } void getAbsoluteFileURL::getAbsoluteFileURL_001_3() { OUString suAssume = aUserDirectoryURL + "/file3"; - check_getAbsoluteFileURL(aUserDirectoryURL, "relative/../file3",osl::FileBase::E_None, suAssume); + check_getAbsoluteFileURL(aUserDirectoryURL, "relative/../file3"_ostr,osl::FileBase::E_None, suAssume); } void getAbsoluteFileURL::getAbsoluteFileURL_001_4() { OUString suAssume = aUserDirectoryURL + "/file4"; - check_getAbsoluteFileURL(aUserDirectoryURL, "././relative/../file4",osl::FileBase::E_None, suAssume); + check_getAbsoluteFileURL(aUserDirectoryURL, "././relative/../file4"_ostr,osl::FileBase::E_None, suAssume); } void getAbsoluteFileURL::getAbsoluteFileURL_001_5() { OUString suAssume; suAssume = aUserDirectoryURL + "/relative/"; - check_getAbsoluteFileURL(aUserDirectoryURL, "././relative/.",osl::FileBase::E_None, suAssume); + check_getAbsoluteFileURL(aUserDirectoryURL, "././relative/."_ostr,osl::FileBase::E_None, suAssume); } void getAbsoluteFileURL::getAbsoluteFileURL_001_6() { OUString suAssume = aUserDirectoryURL + "/.relative"; - check_getAbsoluteFileURL(aUserDirectoryURL, "./.relative",osl::FileBase::E_None, suAssume); + check_getAbsoluteFileURL(aUserDirectoryURL, "./.relative"_ostr,osl::FileBase::E_None, suAssume); } void getAbsoluteFileURL::getAbsoluteFileURL_001_7() { OUString suAssume; suAssume = aUserDirectoryURL + "/.a/"; - check_getAbsoluteFileURL(aUserDirectoryURL, "./.a/mydir/..",osl::FileBase::E_None, suAssume); + check_getAbsoluteFileURL(aUserDirectoryURL, "./.a/mydir/.."_ostr,osl::FileBase::E_None, suAssume); } void getAbsoluteFileURL::getAbsoluteFileURL_001_8() { OUString suAssume = aUserDirectoryURL + "/tmp/ok"; - check_getAbsoluteFileURL(aUserDirectoryURL, "tmp//ok",osl::FileBase::E_None, suAssume); + check_getAbsoluteFileURL(aUserDirectoryURL, "tmp//ok"_ostr,osl::FileBase::E_None, suAssume); } void getAbsoluteFileURL::getAbsoluteFileURL_002() @@ -572,7 +572,7 @@ namespace osl_FileBase createTestDirectory(aUStrBase); OUString suAssume = aUserDirectoryURL + "/mytestfile"; - check_getAbsoluteFileURL(aUStrBase, "../../mytestfile" , osl::FileBase::E_None, suAssume); + check_getAbsoluteFileURL(aUStrBase, "../../mytestfile"_ostr , osl::FileBase::E_None, suAssume); deleteTestDirectory(aUStrBase); deleteTestDirectory(aUStrUpBase); } @@ -790,16 +790,16 @@ namespace osl_FileBase void SystemPath_FileURL::getSystemPathFromFileURL_001_1() { - OString sURL(""); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL(""_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_2() { - OString sURL("/"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "\\"); + OString sURL("/"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "\\"_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_21() @@ -819,107 +819,107 @@ namespace osl_FileBase In other words, %2F ("/") is NOT the same as /. */ - OString sURL("%2F"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL("%2F"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_22() { - OString sURL("file:///tmp%2Fmydir"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL("file:///tmp%2Fmydir"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_3() { - OString sURL("a"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "a"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "a"); + OString sURL("a"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "a"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "a"_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_31() { - OString sURL("tmpname"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "tmpname"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "tmpname"); + OString sURL("tmpname"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "tmpname"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "tmpname"_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_4() { - OString sURL("file://"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, ""); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL("file://"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, ""_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_41() { - OString sURL("file://localhost/tmp"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, ""); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL("file://localhost/tmp"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, ""_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_5() { - OString sURL("file:///tmp"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL("file:///tmp"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_51() { - OString sURL("file://c:/tmp"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL("file://c:/tmp"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_52() { - OString sURL("file:///c:/tmp"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp"); + OString sURL("file:///c:/tmp"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp"_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_53() { - OString sURL("file:///c|/tmp"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c|/tmp"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp"); + OString sURL("file:///c|/tmp"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c|/tmp"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp"_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_6() { - OString sURL("file:///tmp/first"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/first"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL("file:///tmp/first"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/first"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_61() { - OString sURL("file:///c:/tmp/first"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/first"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\first"); + OString sURL("file:///c:/tmp/first"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/first"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\first"_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_7() { - OString sURL("file:///tmp/../second"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/../second"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL("file:///tmp/../second"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/../second"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_71() { - OString sURL("file:///c:/tmp/../second"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/../second"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\..\\second"); + OString sURL("file:///c:/tmp/../second"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/../second"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\..\\second"_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_8() { - OString sURL("../tmp"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "../tmp"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "..\\tmp"); + OString sURL("../tmp"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "../tmp"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "..\\tmp"_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_81() @@ -936,23 +936,23 @@ namespace osl_FileBase void SystemPath_FileURL::getSystemPathFromFileURL_001_9() { - OString sURL("file:///tmp/first%20second"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/first second"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL("file:///tmp/first%20second"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/first second"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_91() { - OString sURL("file:///c:/tmp/first%20second"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/first second"); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\first second"); + OString sURL("file:///c:/tmp/first%20second"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/first second"_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\first second"_ostr); } void SystemPath_FileURL::getSystemPathFromFileURL_001_92() { - OString sURL("ca@#;+.,$///78no%01ni..name"); - checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); - checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""); + OString sURL("ca@#;+.,$///78no%01ni..name"_ostr); + checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); + checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, ""_ostr); } // normal legal case @@ -1003,48 +1003,48 @@ namespace osl_FileBase void SystemPath_FileURL::getFileURLFromSystemPath_001() { - OString sSysPath("~/tmp"); + OString sSysPath("~/tmp"_ostr); char* home_path; home_path = getenv("HOME"); OString expResult(home_path ? home_path : ""); expResult = "file://"+ expResult + "/tmp"; checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, expResult); - checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "~/tmp"); + checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "~/tmp"_ostr); } void SystemPath_FileURL::getFileURLFromSystemPath_002() { - OString sSysPath("c:/tmp"); - checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "c:/tmp"); - checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "file:///c:/tmp"); + OString sSysPath("c:/tmp"_ostr); + checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "c:/tmp"_ostr); + checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "file:///c:/tmp"_ostr); } void SystemPath_FileURL::getFileURLFromSystemPath_003() { - OString sSysPath("file:///temp"); - checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""); - checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""); + OString sSysPath("file:///temp"_ostr); + checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""_ostr); + checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getFileURLFromSystemPath_004() { - OString sSysPath("//tmp//first start"); - checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "file:///tmp/first%20start"); - checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""); + OString sSysPath("//tmp//first start"_ostr); + checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "file:///tmp/first%20start"_ostr); + checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getFileURLFromSystemPath_004_1() { - OString sSysPath("/tmp///first start"); - checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "file:///tmp/first%20start"); - checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""); + OString sSysPath("/tmp///first start"_ostr); + checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "file:///tmp/first%20start"_ostr); + checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""_ostr); } void SystemPath_FileURL::getFileURLFromSystemPath_005() { - OString sSysPath(""); - checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""); - checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""); + OString sSysPath(""_ostr); + checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""_ostr); + checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, ""_ostr); } // testing the method diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index cab3bffd2d17..75a74a717607 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -370,9 +370,9 @@ public: std::vector<OString> different_child_env_vars { - ENV1, - ENV2, - ENV4 + ENV1 ""_ostr, + ENV2 ""_ostr, + ENV4 ""_ostr }; CPPUNIT_ASSERT_MESSAGE diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index 55bbd47b006f..3844c5613bd3 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -269,18 +269,18 @@ public: void decode_001() { - test_encode_and_decode(0,0,""); - test_encode_and_decode(0,0,"hallo"); - test_encode_and_decode(1,0,"B2Aahg5B"); - test_encode_and_decode(1,2,"Longer text string"); + test_encode_and_decode(0,0,""_ostr); + test_encode_and_decode(0,0,"hallo"_ostr); + test_encode_and_decode(1,0,"B2Aahg5B"_ostr); + test_encode_and_decode(1,2,"Longer text string"_ostr); } void decode_002() { - test_encode(0,0,""); - test_encode(0,0,"hallo"); - test_encode(1,0,"B2Aahg5B"); - test_encode(1,2,"Longer text string"); + test_encode(0,0,""_ostr); + test_encode(0,0,"hallo"_ostr); + test_encode(1,0,"B2Aahg5B"_ostr); + test_encode(1,2,"Longer text string"_ostr); } // Change the following lines only, if you add, remove or rename // member functions of the current class, diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index e259eead6a69..2244d98e3cc7 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -257,7 +257,7 @@ public: void testPBKDF2() { - OString aPassword = "Password"; + OString aPassword = "Password"_ostr; // all permutations runCheckPBKDF2(aPassword, false, 1); @@ -381,7 +381,7 @@ public: OString sKey = createHex(pResult.get(), RTL_DIGEST_LENGTH_SHA1); - CPPUNIT_ASSERT_EQUAL(OString("06f460d693aecdd3b5cbe8365408eccfc570f32a"), sKey); + CPPUNIT_ASSERT_EQUAL("06f460d693aecdd3b5cbe8365408eccfc570f32a"_ostr, sKey); } // tdf#114939, verify that rtl_digest_SHA1 computes broken results for certain input (which @@ -393,7 +393,7 @@ public: result, RTL_DIGEST_LENGTH_SHA1); // Rather than correct "9cb1dab34448c1ea460da1f8736869c8852f212f": CPPUNIT_ASSERT_EQUAL( - OString("90a461ee9cc69cedaeb25c2dc5cc62544ebd5241"), + "90a461ee9cc69cedaeb25c2dc5cc62544ebd5241"_ostr, createHex(result, RTL_DIGEST_LENGTH_SHA1)); } } @@ -411,71 +411,71 @@ public: 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, }; OString const expected[] = { - "d41d8cd98f00b204e9800998ecf8427e", - "cfcd208495d565ef66e7dff9f98764da", - "b4b147bc522828731f1a016bfa72c073", - "c6f057b86584942e415435ffb1fa93d4", - "4a7d1ed414474e4033ac29ccb8653d9b", - "dcddb75469b4b4875094e14561e573d8", - "670b14728ad9902aecba32e22fa4f6bd", - "29c3eea3f305d6b823f562ac4be35217", - "dd4b21e9ef71e1291183a46b913ae6f2", - "4c93008615c2d041e33ebac605d14b5b", - "f1b708bba17f1ce948dc979f4d7092bc", - "645a8aca5a5b84527c57ee2f153f1946", - "35b9ab5a36f3234dd26db357fd4a0dc1", - "4aad0d9ff11812ebdd5e376fdbef6222", - "c47532bbb1e2883c902071591ae1ec9b", - "5284047f4ffb4e04824a2fd1d1f0cd62", - "1e4a1b03d1b6cd8a174a826f76e009f4", - "0e7b9f29a828b6f953b482fc299e536b", - "3ea032bf79e8c116b05f4698d5a8e044", - "15f47c8a3e5e9685307dd65a653b8dc0", - "cc545187d0745132de1e9941db0ef6ce", - "0585e303e79acd837c3a3e2a2bec8b18", - "b28ccfdee4b9f39ba18b58a4f61a03d1", - "d018229b1183c926c10ea688350afec8", - "660719b4a7591769583a7c8d20c6dfa4", - "1e2432adacf481836265fcc62ee8f3e3", - "6e88e2af74c1d9d7d7d652b90d03751e", - "780ca685003cec1d617beaa6f346e1be", - "7f2e1dcfd6e2a3f5c38f31e640136ff6", - "1a3dee46117aeb8010cf365b8653faa8", - "1d0064395af3c745f6c3194e92373d7a", - "b52582043219f2deb2d3c9cb05d6448a", - "cd9e459ea708a948d5c2f5a6ca8838cf", - "00de800ecd7a4fb2813986c987e46d51", - "15336d4b38561a82bd24c9398b781aed", - "5fe699d3c461ab5a795505f59d5adf15", - "c5e0eb03cbb4bea95ce3f8f48fca77d5", - "355c1410373ef02fff2b03844d72c7d4", - "02df97da8207de2b3afa69c151ca8958", - "82c66dbf3e73f87ffc9564b2098d6a4f", - "b373e3ddc3438d7c10c76f3ad9d4c401", - "fac901a4a3dbc4461541731a33a31d15", - "f573e011b414bf3f9dd284f7dad29592", - "11694570cc5dda099669f2ba3660a70d", - "60997cc8aef7fedd9995e6b3ca89ce26", - "63c5fcf83c2275fe64e880dd8dfc5cd6", - "c7a0a100057ebbfc63ee169562026aea", - "42c2dec247919384edece38033458627", - "b505acf9fc996902b0c547a2abfc62b2", - "2fa7a1321d6b5fa0e04ad46785f574f3", - "86d2bfc0bab44eecf21e1432be7b3efc", - "7ca318f12a0955a3e637dc5645a2f96e", - "3eda02765b8fb8bb9b20c735f4537827", - "26dead12262c9a5c115b01e0a3c805b6", - "978b0444e93c5f7d714575f28a77dca1", - "d7fe636bd28e2ee2ba4d6c5898318699", - "ce992c2ad906967c63c3f9ab0c2294a9", - "1f3b814e9d417e9fd8750299982feb1f", - "1a2f42174eaa78ce6a67d75e98a59cb6", - "17c772c45c9a09f6e56b7228ddd161a7", - "5b19445b70b493c78f3bc06eb7962315", - "e590c24cc612bdedd522dfe23bb29b42", - "4d78c699a0167bc0cfce8a5c5a715c0e", - "5703db92acb9d45e3975822c9206453f", - "10eab6008d5642cf42abd2aa41f847cb", + "d41d8cd98f00b204e9800998ecf8427e"_ostr, + "cfcd208495d565ef66e7dff9f98764da"_ostr, + "b4b147bc522828731f1a016bfa72c073"_ostr, + "c6f057b86584942e415435ffb1fa93d4"_ostr, + "4a7d1ed414474e4033ac29ccb8653d9b"_ostr, + "dcddb75469b4b4875094e14561e573d8"_ostr, + "670b14728ad9902aecba32e22fa4f6bd"_ostr, + "29c3eea3f305d6b823f562ac4be35217"_ostr, + "dd4b21e9ef71e1291183a46b913ae6f2"_ostr, + "4c93008615c2d041e33ebac605d14b5b"_ostr, + "f1b708bba17f1ce948dc979f4d7092bc"_ostr, + "645a8aca5a5b84527c57ee2f153f1946"_ostr, + "35b9ab5a36f3234dd26db357fd4a0dc1"_ostr, + "4aad0d9ff11812ebdd5e376fdbef6222"_ostr, + "c47532bbb1e2883c902071591ae1ec9b"_ostr, + "5284047f4ffb4e04824a2fd1d1f0cd62"_ostr, + "1e4a1b03d1b6cd8a174a826f76e009f4"_ostr, + "0e7b9f29a828b6f953b482fc299e536b"_ostr, + "3ea032bf79e8c116b05f4698d5a8e044"_ostr, + "15f47c8a3e5e9685307dd65a653b8dc0"_ostr, + "cc545187d0745132de1e9941db0ef6ce"_ostr, + "0585e303e79acd837c3a3e2a2bec8b18"_ostr, + "b28ccfdee4b9f39ba18b58a4f61a03d1"_ostr, + "d018229b1183c926c10ea688350afec8"_ostr, + "660719b4a7591769583a7c8d20c6dfa4"_ostr, + "1e2432adacf481836265fcc62ee8f3e3"_ostr, + "6e88e2af74c1d9d7d7d652b90d03751e"_ostr, + "780ca685003cec1d617beaa6f346e1be"_ostr, + "7f2e1dcfd6e2a3f5c38f31e640136ff6"_ostr, + "1a3dee46117aeb8010cf365b8653faa8"_ostr, + "1d0064395af3c745f6c3194e92373d7a"_ostr, + "b52582043219f2deb2d3c9cb05d6448a"_ostr, + "cd9e459ea708a948d5c2f5a6ca8838cf"_ostr, + "00de800ecd7a4fb2813986c987e46d51"_ostr, + "15336d4b38561a82bd24c9398b781aed"_ostr, + "5fe699d3c461ab5a795505f59d5adf15"_ostr, + "c5e0eb03cbb4bea95ce3f8f48fca77d5"_ostr, + "355c1410373ef02fff2b03844d72c7d4"_ostr, + "02df97da8207de2b3afa69c151ca8958"_ostr, + "82c66dbf3e73f87ffc9564b2098d6a4f"_ostr, + "b373e3ddc3438d7c10c76f3ad9d4c401"_ostr, + "fac901a4a3dbc4461541731a33a31d15"_ostr, + "f573e011b414bf3f9dd284f7dad29592"_ostr, + "11694570cc5dda099669f2ba3660a70d"_ostr, + "60997cc8aef7fedd9995e6b3ca89ce26"_ostr, + "63c5fcf83c2275fe64e880dd8dfc5cd6"_ostr, + "c7a0a100057ebbfc63ee169562026aea"_ostr, + "42c2dec247919384edece38033458627"_ostr, + "b505acf9fc996902b0c547a2abfc62b2"_ostr, + "2fa7a1321d6b5fa0e04ad46785f574f3"_ostr, + "86d2bfc0bab44eecf21e1432be7b3efc"_ostr, + "7ca318f12a0955a3e637dc5645a2f96e"_ostr, + "3eda02765b8fb8bb9b20c735f4537827"_ostr, + "26dead12262c9a5c115b01e0a3c805b6"_ostr, + "978b0444e93c5f7d714575f28a77dca1"_ostr, + "d7fe636bd28e2ee2ba4d6c5898318699"_ostr, + "ce992c2ad906967c63c3f9ab0c2294a9"_ostr, + "1f3b814e9d417e9fd8750299982feb1f"_ostr, + "1a2f42174eaa78ce6a67d75e98a59cb6"_ostr, + "17c772c45c9a09f6e56b7228ddd161a7"_ostr, + "5b19445b70b493c78f3bc06eb7962315"_ostr, + "e590c24cc612bdedd522dfe23bb29b42"_ostr, + "4d78c699a0167bc0cfce8a5c5a715c0e"_ostr, + "5703db92acb9d45e3975822c9206453f"_ostr, + "10eab6008d5642cf42abd2aa41f847cb"_ostr, }; rtlDigest digest = rtl_digest_createMD5(); for (size_t i = 0; i < sizeof(data); ++i) diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx index 9024fe491f1d..c4e13ff619a9 100644 --- a/sal/qa/rtl/ostring/rtl_str.cxx +++ b/sal/qa/rtl/ostring/rtl_str.cxx @@ -31,8 +31,8 @@ namespace rtl_str { void compare_001() { - OString aStr1 = ""; - OString aStr2 = ""; + OString aStr1 = ""_ostr; + OString aStr2 = ""_ostr; sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal.", sal_Int32(0), nValue); @@ -40,8 +40,8 @@ namespace rtl_str void compare_002() { - OString aStr1 = "Line must be equal."; - OString aStr2 = "Line must be equal."; + OString aStr1 = "Line must be equal."_ostr; + OString aStr2 = "Line must be equal."_ostr; sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal.", sal_Int32(0), nValue); @@ -49,8 +49,8 @@ namespace rtl_str void compare_003() { - OString aStr1 = "Line must differ."; - OString aStr2 = "Line foo bar, ok, differ."; + OString aStr1 = "Line must differ."_ostr; + OString aStr2 = "Line foo bar, ok, differ."_ostr; sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -71,8 +71,8 @@ namespace rtl_str { void compare_001() { - OString aStr1 = ""; - OString aStr2 = ""; + OString aStr1 = ""_ostr; + OString aStr2 = ""_ostr; sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal.", sal_Int32(0), nValue); @@ -80,8 +80,8 @@ namespace rtl_str void compare_002() { - OString aStr1 = "Line must be equal."; - OString aStr2 = "Line must be equal."; + OString aStr1 = "Line must be equal."_ostr; + OString aStr2 = "Line must be equal."_ostr; sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal.", sal_Int32(0), nValue); @@ -89,8 +89,8 @@ namespace rtl_str void compare_002_1() { - OString aStr1 = "Line must be equal."; - OString aStr2 = "LINE MUST BE EQUAL."; + OString aStr1 = "Line must be equal."_ostr; + OString aStr2 = "LINE MUST BE EQUAL."_ostr; sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal (if case insensitive).", sal_Int32(0), nValue); @@ -98,8 +98,8 @@ namespace rtl_str void compare_003() { - OString aStr1 = "Line must differ."; - OString aStr2 = "Line foo bar, ok, differ."; + OString aStr1 = "Line must differ."_ostr; + OString aStr2 = "Line foo bar, ok, differ."_ostr; sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -126,13 +126,13 @@ namespace rtl_str void compare_000_1() { - OString aStr1 = "Line must be equal."; + OString aStr1 = "Line must be equal."_ostr; rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), nullptr, 0, 1); } void compare_001() { - OString aStr1 = ""; - OString aStr2 = ""; + OString aStr1 = ""_ostr; + OString aStr2 = ""_ostr; sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), aStr1.getLength()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal.", sal_Int32(0), nValue); @@ -140,8 +140,8 @@ namespace rtl_str void compare_002() { - OString aStr1 = "Line must be equal."; - OString aStr2 = "Line must be equal."; + OString aStr1 = "Line must be equal."_ostr; + OString aStr2 = "Line must be equal."_ostr; sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -151,8 +151,8 @@ namespace rtl_str void compare_002_1() { - OString aStr1 = "Line must be equal."; - OString aStr2 = "LINE MUST BE EQUAL."; + OString aStr1 = "Line must be equal."_ostr; + OString aStr2 = "LINE MUST BE EQUAL."_ostr; sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -162,8 +162,8 @@ namespace rtl_str void compare_003() { - OString aStr1 = "Line must differ."; - OString aStr2 = "Line foo bar, ok, differ."; + OString aStr1 = "Line must differ."_ostr; + OString aStr2 = "Line foo bar, ok, differ."_ostr; sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -173,8 +173,8 @@ namespace rtl_str void compare_004() { - OString aStr1 = "Line must differ."; - OString aStr2 = "Line foo bar, ok, differ."; + OString aStr1 = "Line must differ."_ostr; + OString aStr2 = "Line foo bar, ok, differ."_ostr; sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -201,7 +201,7 @@ namespace rtl_str { void hashCode_001() { - OString aStr1 = "Line for a hashCode."; + OString aStr1 = "Line for a hashCode."_ostr; sal_Int32 nHashCode = rtl_str_hashCode( aStr1.getStr() ); printf("hashcode: %" SAL_PRIdINT32 "\n", nHashCode); // CPPUNIT_ASSERT_MESSAGE("failed.", nValue == 0); @@ -209,10 +209,10 @@ namespace rtl_str void hashCode_002() { - OString aStr1 = "Line for a hashCode."; + OString aStr1 = "Line for a hashCode."_ostr; sal_Int32 nHashCode1 = rtl_str_hashCode( aStr1.getStr() ); - OString aStr2 = "Line for a hashCode."; + OString aStr2 = "Line for a hashCode."_ostr; sal_Int32 nHashCode2 = rtl_str_hashCode( aStr2.getStr() ); CPPUNIT_ASSERT_EQUAL_MESSAGE("hashcodes must be equal.", nHashCode1, nHashCode2 ); @@ -220,10 +220,10 @@ namespace rtl_str void hashCode_003() { - OString aStr1 = "Line for a hashCode."; + OString aStr1 = "Line for a hashCode."_ostr; sal_Int32 nHashCode1 = rtl_str_hashCode( aStr1.getStr() ); - OString aStr2 = "Line for another hashcode."; + OString aStr2 = "Line for another hashcode."_ostr; sal_Int32 nHashCode2 = rtl_str_hashCode( aStr2.getStr() ); CPPUNIT_ASSERT_MESSAGE("hashcodes must differ.", nHashCode1 != nHashCode2 ); @@ -251,7 +251,7 @@ namespace rtl_str void indexOfChar_001() { - OString aStr1 = "Line for an indexOfChar."; + OString aStr1 = "Line for an indexOfChar."_ostr; sal_Int32 nIndex = rtl_str_indexOfChar( aStr1.getStr(), 'L' ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(0), nIndex); @@ -268,7 +268,7 @@ namespace rtl_str void indexOfChar_002() { - OString aStr1 = "Line for an indexOfChar."; + OString aStr1 = "Line for an indexOfChar."_ostr; sal_Int32 nIndex = rtl_str_indexOfChar( aStr1.getStr(), 'y' ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(-1), nIndex); @@ -296,7 +296,7 @@ namespace rtl_str void lastIndexOfChar_001() { - OString aStr1 = "Line for a lastIndexOfChar."; + OString aStr1 = "Line for a lastIndexOfChar."_ostr; sal_Int32 nIndex = rtl_str_lastIndexOfChar( aStr1.getStr(), 'C' ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(22), nIndex); @@ -313,7 +313,7 @@ namespace rtl_str void lastIndexOfChar_002() { - OString aStr1 = "Line for a lastIndexOfChar."; + OString aStr1 = "Line for a lastIndexOfChar."_ostr; sal_Int32 nIndex = rtl_str_lastIndexOfChar( aStr1.getStr(), 'y' ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(-1), nIndex); @@ -334,7 +334,7 @@ namespace rtl_str { void indexOfStr_000() { - OString aStr1("Line for an indexOfStr."); + OString aStr1("Line for an indexOfStr."_ostr); sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "" ); CPPUNIT_ASSERT_EQUAL_MESSAGE("an empty substring is always not findable", sal_Int32(-1), nIndex); @@ -342,7 +342,7 @@ namespace rtl_str void indexOfStr_001() { - OString aStr1 = "Line for an indexOfStr."; + OString aStr1 = "Line for an indexOfStr."_ostr; sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "Line" ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(0), nIndex); @@ -359,7 +359,7 @@ namespace rtl_str void indexOfStr_002() { - OString aStr1 = "Line for an indexOfStr."; + OString aStr1 = "Line for an indexOfStr."_ostr; sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "not exist" ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(-1), nIndex); @@ -380,7 +380,7 @@ namespace rtl_str { void lastIndexOfStr_000() { - OString aStr1("Line for a lastIndexOfStr."); + OString aStr1("Line for a lastIndexOfStr."_ostr); sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), "" ); CPPUNIT_ASSERT_EQUAL_MESSAGE("an empty substring is always not findable", sal_Int32(-1), nIndex); @@ -388,8 +388,8 @@ namespace rtl_str void lastIndexOfStr_001() { - OString aStr1 = "Line for a lastIndexOfStr."; - OString aSearchStr = "Index"; + OString aStr1 = "Line for a lastIndexOfStr."_ostr; + OString aSearchStr = "Index"_ostr; sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(15), nIndex); @@ -405,8 +405,8 @@ namespace rtl_str void lastIndexOfStr_002() { - OString aStr1 = "Line for a lastIndexOfStr."; - OString aSearchStr = "foo"; + OString aStr1 = "Line for a lastIndexOfStr."_ostr; + OString aSearchStr = "foo"_ostr; sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(-1), nIndex); @@ -414,8 +414,8 @@ namespace rtl_str void lastIndexOfStr_003() { - OString aStr1 = "Line for a lastIndexOfStr."; - OString aSearchStr = "O"; + OString aStr1 = "Line for a lastIndexOfStr."_ostr; + OString aSearchStr = "O"_ostr; sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_EQUAL_MESSAGE("index is wrong.", sal_Int32(20), nIndex); @@ -437,8 +437,8 @@ namespace rtl_str { void replaceChar_001() { - OString aStr1 = "replace char."; - OString aShouldStr1 = "ruplacu char."; + OString aStr1 = "replace char."_ostr; + OString aShouldStr1 = "ruplacu char."_ostr; char* pStr = static_cast<char*>(malloc(aStr1.getLength() + 1)); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != nullptr); @@ -468,8 +468,8 @@ namespace rtl_str void replaceChar_WithLength_001() { - OString aStr1 = "replace char."; - OString aShouldStr1 = "ruplace char."; + OString aStr1 = "replace char."_ostr; + OString aShouldStr1 = "ruplace char."_ostr; char* pStr = static_cast<char*>(malloc(aStr1.getLength() + 1)); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != nullptr); @@ -495,8 +495,8 @@ namespace rtl_str { void toAsciiLowerCase_001() { - OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE."; - OString aShouldStr1 = "change this to ascii lower case."; + OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE."_ostr; + OString aShouldStr1 = "change this to ascii lower case."_ostr; char* pStr = static_cast<char*>(malloc(aStr1.getLength() + 1)); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != nullptr); @@ -526,8 +526,8 @@ namespace rtl_str void toAsciiLowerCase_WithLength_001() { - OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE."; - OString aShouldStr1 = "change thiS TO ASCII LOWER CASE."; + OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE."_ostr; + OString aShouldStr1 = "change thiS TO ASCII LOWER CASE."_ostr; char* pStr = static_cast<char*>(malloc(aStr1.getLength() + 1)); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != nullptr); @@ -554,8 +554,8 @@ namespace rtl_str { void toAsciiUpperCase_001() { - OString aStr1 = "change this to ascii upper case."; - OString aShouldStr1 = "CHANGE THIS TO ASCII UPPER CASE."; + OString aStr1 = "change this to ascii upper case."_ostr; + OString aShouldStr1 = "CHANGE THIS TO ASCII UPPER CASE."_ostr; char* pStr = static_cast<char*>(malloc(aStr1.getLength() + 1)); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != nullptr); @@ -585,8 +585,8 @@ namespace rtl_str void toAsciiUpperCase_WithLength_001() { - OString aStr1 = "change this to ascii lower case."; - OString aShouldStr1 = "CHANGE THIs to ascii lower case."; + OString aStr1 = "change this to ascii lower case."_ostr; + OString aShouldStr1 = "CHANGE THIs to ascii lower case."_ostr; char* pStr = static_cast<char*>(malloc(aStr1.getLength() + 1)); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != nullptr); diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index bff3a0d145f1..ee1b861a694e 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -257,7 +257,7 @@ public: toDouble_test_impl(_sValue); // test also the negative part. - OString sNegativValue("-"); + OString sNegativValue("-"_ostr); sNegativValue += _sValue; toDouble_test_impl(sNegativValue); } @@ -287,53 +287,53 @@ public: void toDouble_test_3() { - toDouble_test("3"); + toDouble_test("3"_ostr); } void toDouble_test_3_5() { - toDouble_test("3.5"); + toDouble_test("3.5"_ostr); } void toDouble_test_3_0625() { - toDouble_test("3.0625"); + toDouble_test("3.0625"_ostr); } void toDouble_test_pi() { // value from http://www.angio.net/pi/digits/50.txt - toDouble_test("3.141592653589793238462643383279502884197169399375"); + toDouble_test("3.141592653589793238462643383279502884197169399375"_ostr); } void toDouble_test_1() { - toDouble_test("1"); + toDouble_test("1"_ostr); } void toDouble_test_10() { - toDouble_test("10"); + toDouble_test("10"_ostr); } void toDouble_test_100() { - toDouble_test("100"); + toDouble_test("100"_ostr); } void toDouble_test_1000() { - toDouble_test("1000"); + toDouble_test("1000"_ostr); } void toDouble_test_10000() { - toDouble_test("10000"); + toDouble_test("10000"_ostr); } void toDouble_test_1e99() { - toDouble_test("1e99"); + toDouble_test("1e99"_ostr); } void toDouble_test_1e_n99() { - toDouble_test("1e-99"); + toDouble_test("1e-99"_ostr); } void toDouble_test_1e308() { - toDouble_test("1e308"); + toDouble_test("1e308"_ostr); } // Change the following lines only, if you add, remove or rename @@ -380,7 +380,7 @@ public: toFloat_test_impl(_sValue); // test also the negative part. - OString sNegativValue("-"); + OString sNegativValue("-"_ostr); sNegativValue += _sValue; toFloat_test_impl(sNegativValue); } @@ -403,61 +403,61 @@ public: void toFloat_test_3() { - toFloat_test("3"); + toFloat_test("3"_ostr); } void toFloat_test_3_5() { - toFloat_test("3.5"); + toFloat_test("3.5"_ostr); } void toFloat_test_3_0625() { - toFloat_test("3.0625"); + toFloat_test("3.0625"_ostr); } void toFloat_test_3_0625_e() { - toFloat_test("3.0625e-4"); + toFloat_test("3.0625e-4"_ostr); } void toFloat_test_pi() { // value from http://www.angio.net/pi/digits/50.txt - toFloat_test("3.141592653589793238462643383279502884197169399375"); + toFloat_test("3.141592653589793238462643383279502884197169399375"_ostr); } void toFloat_test_1() { - toFloat_test("1"); + toFloat_test("1"_ostr); } void toFloat_test_10() { - toFloat_test("10"); + toFloat_test("10"_ostr); } void toFloat_test_100() { - toFloat_test("100"); + toFloat_test("100"_ostr); } void toFloat_test_1000() { - toFloat_test("1000"); + toFloat_test("1000"_ostr); } void toFloat_test_10000() { - toFloat_test("10000"); + toFloat_test("10000"_ostr); } void toFloat_test_mix() { - toFloat_test("456789321455.123456789012"); + toFloat_test("456789321455.123456789012"_ostr); } void toFloat_test_1e99() { - toFloat_test("1e99"); + toFloat_test("1e99"_ostr); } void toFloat_test_1e_n99() { - toFloat_test("1e-9"); + toFloat_test("1e-9"_ostr); } void toFloat_test_1e308() { - toFloat_test("1e308"); + toFloat_test("1e308"_ostr); } // Change the following lines only, if you add, remove or rename diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx index 9ef70516a756..9a7b2dbc5081 100644 --- a/sal/qa/rtl/oustring/rtl_ustr.cxx +++ b/sal/qa/rtl/oustring/rtl_ustr.cxx @@ -799,7 +799,7 @@ namespace rtl_ustr void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_2() { OUString aStr1("Line must be equal."); - OString sStr2 = "Line is shorter."; + OString sStr2 = "Line is shorter."_ostr; rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr(), 0); // should not GPF } @@ -815,7 +815,7 @@ namespace rtl_ustr void ascii_shortenedCompareIgnoreAsciiCase_WithLength_002() { OUString suStr1("Line must be equal."); - OString sStr2 = "Line must be equal."; + OString sStr2 = "Line must be equal."_ostr; sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal.", sal_Int32(0), nValue); @@ -824,7 +824,7 @@ namespace rtl_ustr void ascii_shortenedCompareIgnoreAsciiCase_WithLength_003() { OUString suStr1("Line must differ."); - OString sStr2 = "Line must be differ and longer."; + OString sStr2 = "Line must be differ and longer."_ostr; sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -861,7 +861,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_WithLength_000_2() { OUString aStr1("Line must be equal."); - OString sStr2 = "Line is shorter."; + OString sStr2 = "Line is shorter."_ostr; rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr()); // should not GPF } @@ -877,7 +877,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_WithLength_002() { OUString suStr1("Line must be equal."); - OString sStr2 = "Line must be equal."; + OString sStr2 = "Line must be equal."_ostr; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal.", sal_Int32(0), nValue); @@ -886,7 +886,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_WithLength_003() { OUString suStr1("Line must differ."); - OString sStr2 = "Line must be differ and longer."; + OString sStr2 = "Line must be differ and longer."_ostr; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -920,7 +920,7 @@ namespace rtl_ustr void ascii_compare_002() { OUString suStr1("Line must be equal."); - OString sStr2 = "Line must be equal."; + OString sStr2 = "Line must be equal."_ostr; sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal.", sal_Int32(0), nValue); @@ -929,7 +929,7 @@ namespace rtl_ustr void ascii_compare_003() { OUString suStr1("Line must differ."); - OString sStr2 = "Line foo bar, ok, differ."; + OString sStr2 = "Line foo bar, ok, differ."_ostr; sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -960,7 +960,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_002() { OUString suStr1("Line must be equal."); - OString sStr2 = "Line must be equal."; + OString sStr2 = "Line must be equal."_ostr; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal.", sal_Int32(0), nValue); @@ -969,7 +969,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_002_1() { OUString suStr1("Line must be equal, when ignore case."); - OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE."; + OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE."_ostr; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); CPPUNIT_ASSERT_EQUAL_MESSAGE("compare failed, strings are equal (if case insensitive).", sal_Int32(0), nValue); @@ -978,7 +978,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_003() { OUString suStr1("Line must differ."); - OString sStr2 = "Line foo bar, ok, differ."; + OString sStr2 = "Line foo bar, ok, differ."_ostr; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); diff --git a/sal/qa/rtl/strings/nonconstarray.cxx b/sal/qa/rtl/strings/nonconstarray.cxx index 167b427cfbec..91922dcd1571 100644 --- a/sal/qa/rtl/strings/nonconstarray.cxx +++ b/sal/qa/rtl/strings/nonconstarray.cxx @@ -92,8 +92,8 @@ private: void testP2266R3() { - CPPUNIT_ASSERT_EQUAL(OString("foo"), returnOString()); - CPPUNIT_ASSERT_EQUAL(OString("foo"), returnOStringBuffer().makeStringAndClear()); + CPPUNIT_ASSERT_EQUAL("foo"_ostr, returnOString()); + CPPUNIT_ASSERT_EQUAL("foo"_ostr, returnOStringBuffer().makeStringAndClear()); } CPPUNIT_TEST_SUITE(Test); diff --git a/sal/qa/rtl/strings/test_ostring.cxx b/sal/qa/rtl/strings/test_ostring.cxx index f0a82a712254..1937edf6863b 100644 --- a/sal/qa/rtl/strings/test_ostring.cxx +++ b/sal/qa/rtl/strings/test_ostring.cxx @@ -37,26 +37,26 @@ void Test::testStartsWithIgnoreAsciiCase() { } { OString r; - CPPUNIT_ASSERT(OString("foo").startsWithIgnoreAsciiCase(std::string_view(), &r)); - CPPUNIT_ASSERT_EQUAL(OString("foo"), r); + CPPUNIT_ASSERT("foo"_ostr.startsWithIgnoreAsciiCase(std::string_view(), &r)); + CPPUNIT_ASSERT_EQUAL("foo"_ostr, r); } { OString r; CPPUNIT_ASSERT( - OString("foo").startsWithIgnoreAsciiCase("F", &r)); - CPPUNIT_ASSERT_EQUAL(OString("oo"), r); + "foo"_ostr.startsWithIgnoreAsciiCase("F", &r)); + CPPUNIT_ASSERT_EQUAL("oo"_ostr, r); } { - OString r("other"); + OString r("other"_ostr); CPPUNIT_ASSERT( - !OString("foo").startsWithIgnoreAsciiCase("bar", &r)); - CPPUNIT_ASSERT_EQUAL(OString("other"), r); + !"foo"_ostr.startsWithIgnoreAsciiCase("bar", &r)); + CPPUNIT_ASSERT_EQUAL("other"_ostr, r); } { - OString r("other"); + OString r("other"_ostr); CPPUNIT_ASSERT( - !OString("foo").startsWithIgnoreAsciiCase("foobar", &r)); - CPPUNIT_ASSERT_EQUAL(OString("other"), r); + !"foo"_ostr.startsWithIgnoreAsciiCase("foobar", &r)); + CPPUNIT_ASSERT_EQUAL("other"_ostr, r); } { @@ -66,26 +66,26 @@ void Test::testStartsWithIgnoreAsciiCase() { } { OString r; - CPPUNIT_ASSERT(OString("foo").startsWithIgnoreAsciiCase("", &r)); - CPPUNIT_ASSERT_EQUAL(OString("foo"), r); + CPPUNIT_ASSERT("foo"_ostr.startsWithIgnoreAsciiCase("", &r)); + CPPUNIT_ASSERT_EQUAL("foo"_ostr, r); } { OString r; CPPUNIT_ASSERT( - OString("foo").startsWithIgnoreAsciiCase("F", &r)); - CPPUNIT_ASSERT_EQUAL(OString("oo"), r); + "foo"_ostr.startsWithIgnoreAsciiCase("F", &r)); + CPPUNIT_ASSERT_EQUAL("oo"_ostr, r); } { - OString r("other"); + OString r("other"_ostr); CPPUNIT_ASSERT( - !OString("foo").startsWithIgnoreAsciiCase("bar", &r)); - CPPUNIT_ASSERT_EQUAL(OString("other"), r); + !"foo"_ostr.startsWithIgnoreAsciiCase("bar", &r)); + CPPUNIT_ASSERT_EQUAL("other"_ostr, r); } { - OString r("other"); + OString r("other"_ostr); CPPUNIT_ASSERT( - !OString("foo").startsWithIgnoreAsciiCase("foobar", &r)); - CPPUNIT_ASSERT_EQUAL(OString("other"), r); + !"foo"_ostr.startsWithIgnoreAsciiCase("foobar", &r)); + CPPUNIT_ASSERT_EQUAL("other"_ostr, r); } } @@ -109,7 +109,7 @@ void Test::testCompareTo() void Test::testUtf8StringLiterals() { - OString sIn(u8"ßa"); + OString sIn(u8"ßa"_ostr); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), sIn.getLength()); CPPUNIT_ASSERT_EQUAL(195, int(static_cast<unsigned char>(sIn[0]))); CPPUNIT_ASSERT_EQUAL(159, int(static_cast<unsigned char>(sIn[1]))); diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx index f7bc41e3cf95..28453023d18c 100644 --- a/sal/qa/rtl/strings/test_ostring_concat.cxx +++ b/sal/qa/rtl/strings/test_ostring_concat.cxx @@ -55,53 +55,53 @@ void test::ostring::StringConcat::checkConcat() { // All the extra () are to protect commas against being treated as separators of macro arguments. CPPUNIT_ASSERT_EQUAL( OString(), OString(OString() + OString())); - CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OString( "foo" ) + OString( "bar" ))); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, OString > )), typeid( OString( "foo" ) + OString( "bar" ))); - CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OString( "foo" ) + "bar" )); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, const char[ 4 ] > )), typeid( OString( "foo" ) + "bar" )); - CPPUNIT_ASSERT_EQUAL( OString( "foobarbaz" ), OString( OString( "foo" ) + "bar" + "baz" )); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringConcat< OString, const char[ 4 ] >, const char[ 4 ] > )), typeid( OString( "foo" ) + "bar" + "baz" )); - CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OStringBuffer( "foo" ) + "bar" )); + CPPUNIT_ASSERT_EQUAL( "foobar"_ostr, OString( "foo"_ostr + "bar"_ostr)); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, OString > )), typeid( "foo"_ostr + "bar"_ostr)); + CPPUNIT_ASSERT_EQUAL( "foobar"_ostr, OString( "foo"_ostr + "bar" )); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, const char[ 4 ] > )), typeid( "foo"_ostr + "bar" )); + CPPUNIT_ASSERT_EQUAL( "foobarbaz"_ostr, OString( "foo"_ostr + "bar" + "baz" )); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringConcat< OString, const char[ 4 ] >, const char[ 4 ] > )), typeid( "foo"_ostr + "bar" + "baz" )); + CPPUNIT_ASSERT_EQUAL( "foobar"_ostr, OString( OStringBuffer( "foo" ) + "bar" )); CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringBuffer, const char[ 4 ] > )), typeid( OStringBuffer( "foo" ) + "bar" )); - CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OStringLiteral( "foo" ) + "bar" )); + CPPUNIT_ASSERT_EQUAL( "foobar"_ostr, OString( OStringLiteral( "foo" ) + "bar" )); CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringLiteral<4>, const char[ 4 ] > )), typeid( OStringLiteral( "foo" ) + "bar" )); - CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OStringLiteral( "foo" ) + static_cast<const char*>("bar") )); + CPPUNIT_ASSERT_EQUAL( "foobar"_ostr, OString( OStringLiteral( "foo" ) + static_cast<const char*>("bar") )); CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringLiteral<4>, const char* > )), typeid( OStringLiteral( "foo" ) + static_cast<const char*>("bar") )); const char d1[] = "xyz"; char d2[] = "abc"; const char* d3 = d1; char* d4 = d2; - CPPUNIT_ASSERT_EQUAL( OString( "fooxyz" ), OString( OString( "foo" ) + d1 )); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, const char[ 4 ] > )), typeid( OString( "foo" ) + d1 )); - CPPUNIT_ASSERT_EQUAL( OString( "fooabc" ), OString( OString( "foo" ) + d2 )); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, char[ 4 ] > )), typeid( OString( "foo" ) + d2 )); - CPPUNIT_ASSERT_EQUAL( OString( "fooxyz" ), OString( OString( "foo" ) + d3 )); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, const char* > )), typeid( OString( "foo" ) + d3 )); - CPPUNIT_ASSERT_EQUAL( OString( "fooabc" ), OString( OString( "foo" ) + d4 )); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, char* > )), typeid( OString( "foo" ) + d4 )); - CPPUNIT_ASSERT_EQUAL( OString( "fooabc" ), OString( OString( "foo" ) + d4 )); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, char* > )), typeid( OString( "foo" ) + d4 )); - CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OString::Concat( "foo" ) + "bar" )); + CPPUNIT_ASSERT_EQUAL( "fooxyz"_ostr, OString( "foo"_ostr + d1 )); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, const char[ 4 ] > )), typeid( "foo"_ostr + d1 )); + CPPUNIT_ASSERT_EQUAL( "fooabc"_ostr, OString( "foo"_ostr + d2 )); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, char[ 4 ] > )), typeid( "foo"_ostr + d2 )); + CPPUNIT_ASSERT_EQUAL( "fooxyz"_ostr, OString( "foo"_ostr + d3 )); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, const char* > )), typeid( "foo"_ostr + d3 )); + CPPUNIT_ASSERT_EQUAL( "fooabc"_ostr, OString( "foo"_ostr + d4 )); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, char* > )), typeid( "foo"_ostr + d4 )); + CPPUNIT_ASSERT_EQUAL( "fooabc"_ostr, OString( "foo"_ostr + d4 )); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, char* > )), typeid( "foo"_ostr + d4 )); + CPPUNIT_ASSERT_EQUAL( "foobar"_ostr, OString( OString::Concat( "foo" ) + "bar" )); CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringConcat< OStringConcatMarker, const char[ 4 ] >, const char[ 4 ] > )), typeid( OString::Concat( "foo" ) + "bar" )); - CPPUNIT_ASSERT_EQUAL( OString( "xyzbar" ), OString( OString::Concat( d1 ) + "bar" )); + CPPUNIT_ASSERT_EQUAL( "xyzbar"_ostr, OString( OString::Concat( d1 ) + "bar" )); CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringConcat< OStringConcatMarker, const char[ 4 ] >, const char[ 4 ] > )), typeid( OString::Concat( d1 ) + "bar" )); - CPPUNIT_ASSERT_EQUAL( OString( "abcbar" ), OString( OString::Concat( d2 ) + "bar" )); + CPPUNIT_ASSERT_EQUAL( "abcbar"_ostr, OString( OString::Concat( d2 ) + "bar" )); CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringConcat< OStringConcatMarker, char[ 4 ] >, const char[ 4 ] > )), typeid( OString::Concat( d2 ) + "bar" )); - CPPUNIT_ASSERT_EQUAL( OString( "xyzbar" ), OString( OString::Concat( d3 ) + "bar" )); + CPPUNIT_ASSERT_EQUAL( "xyzbar"_ostr, OString( OString::Concat( d3 ) + "bar" )); CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringConcat< OStringConcatMarker, const char* >, const char[ 4 ] > )), typeid( OString::Concat( d3 ) + "bar" )); - CPPUNIT_ASSERT_EQUAL( OString( "abcbar" ), OString( OString::Concat( d4 ) + "bar" )); + CPPUNIT_ASSERT_EQUAL( "abcbar"_ostr, OString( OString::Concat( d4 ) + "bar" )); CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringConcat< OStringConcatMarker, char* >, const char[ 4 ] > )), typeid( OString::Concat( d4 ) + "bar" )); - CPPUNIT_ASSERT_EQUAL( OString( "num10" ), OString( OString( "num" ) + OString::number( 10 ))); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, StringNumber< char, RTL_STR_MAX_VALUEOFINT32 > > )), typeid( OString( "num" ) + OString::number( 10 ))); - CPPUNIT_ASSERT_EQUAL( OString( "num10" ), OString( OString( "num" ) + OString::number( 10L ))); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, StringNumber< char, RTL_STR_MAX_VALUEOFINT64 > > )), typeid( OString( "num" ) + OString::number( 10L ))); - CPPUNIT_ASSERT_EQUAL( OString( "num10" ), OString( OString( "num" ) + OString::number( 10ULL ))); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, StringNumber< char, RTL_STR_MAX_VALUEOFUINT64 > > )), typeid( OString( "num" ) + OString::number( 10ULL ))); - CPPUNIT_ASSERT_EQUAL( OString( "num10.5" ), OString( OString( "num" ) + OString::number( 10.5f ))); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, OString > )), typeid( OString( "num" ) + OString::number( 10.5f ))); - CPPUNIT_ASSERT_EQUAL( OString( "num10.5" ), OString( OString( "num" ) + OString::number( 10.5 ))); - CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, OString > )), typeid( OString( "num" ) + OString::number( 10.5 ))); + CPPUNIT_ASSERT_EQUAL( "num10"_ostr, OString( "num"_ostr + OString::number( 10 ))); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, StringNumber< char, RTL_STR_MAX_VALUEOFINT32 > > )), typeid( "num"_ostr + OString::number( 10 ))); + CPPUNIT_ASSERT_EQUAL( "num10"_ostr, OString( "num"_ostr + OString::number( 10L ))); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, StringNumber< char, RTL_STR_MAX_VALUEOFINT64 > > )), typeid( "num"_ostr + OString::number( 10L ))); + CPPUNIT_ASSERT_EQUAL( "num10"_ostr, OString( "num"_ostr + OString::number( 10ULL ))); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, StringNumber< char, RTL_STR_MAX_VALUEOFUINT64 > > )), typeid( "num"_ostr + OString::number( 10ULL ))); + CPPUNIT_ASSERT_EQUAL( "num10.5"_ostr, OString( "num"_ostr + OString::number( 10.5f ))); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, OString > )), typeid( "num"_ostr + OString::number( 10.5f ))); + CPPUNIT_ASSERT_EQUAL( "num10.5"_ostr, OString( "num"_ostr + OString::number( 10.5 ))); + CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, OString > )), typeid( "num"_ostr + OString::number( 10.5 ))); } void test::ostring::StringConcat::checkEnsureCapacity() @@ -144,12 +144,12 @@ void test::ostring::StringConcat::checkEnsureCapacity() void test::ostring::StringConcat::checkAppend() { - OString str( "foo" ); + OString str( "foo"_ostr ); str += OStringLiteral( "bar" ) + "baz"; - CPPUNIT_ASSERT_EQUAL( OString( "foobarbaz" ), str ); + CPPUNIT_ASSERT_EQUAL( "foobarbaz"_ostr, str ); OStringBuffer buf( "foo" ); buf.append( OStringLiteral( "bar" ) + "baz" ); - CPPUNIT_ASSERT_EQUAL( OString( "foobarbaz" ), buf.makeStringAndClear()); + CPPUNIT_ASSERT_EQUAL( "foobarbaz"_ostr, buf.makeStringAndClear()); } #define INVALID_CONCAT( expression ) \ @@ -161,16 +161,16 @@ void test::ostring::StringConcat::checkAppend() void test::ostring::StringConcat::checkInvalid() { CPPUNIT_ASSERT( !INVALID_CONCAT( OString() + OString())); - CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUString( "b" ))); - CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUStringBuffer( "b" ))); - CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUStringLiteral( u"b" ))); - CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUString::Concat( u"b" ))); - CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + 1 )); + CPPUNIT_ASSERT( INVALID_CONCAT( "a"_ostr + OUString( "b" ))); + CPPUNIT_ASSERT( INVALID_CONCAT( "a"_ostr + OUStringBuffer( "b" ))); + CPPUNIT_ASSERT( INVALID_CONCAT( "a"_ostr + OUStringLiteral( u"b" ))); + CPPUNIT_ASSERT( INVALID_CONCAT( "a"_ostr + OUString::Concat( u"b" ))); + CPPUNIT_ASSERT( INVALID_CONCAT( "a"_ostr + 1 )); rtl_String* rs = nullptr; rtl_uString* rus = nullptr; CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "b" ) + rs )); CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "b" ) + rus )); - CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUString::number( 10 ))); + CPPUNIT_ASSERT( INVALID_CONCAT( "a"_ostr + OUString::number( 10 ))); CPPUNIT_ASSERT( INVALID_CONCAT( OString::number( 0 ) + OUString::number( 10 ))); #if 0 diff --git a/sal/qa/rtl/strings/test_oustring_concat.cxx b/sal/qa/rtl/strings/test_oustring_concat.cxx index e7c42636830a..0aae9c4bc2f3 100644 --- a/sal/qa/rtl/strings/test_oustring_concat.cxx +++ b/sal/qa/rtl/strings/test_oustring_concat.cxx @@ -171,7 +171,7 @@ void test::oustring::StringConcat::checkAppend() void test::oustring::StringConcat::checkInvalid() { CPPUNIT_ASSERT( !INVALID_CONCAT( OUString() + OUString())); - CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "a" ) + OString( "b" ))); + CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "a" ) + "b"_ostr)); CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "a" ) + OStringBuffer( "b" ))); CPPUNIT_ASSERT( INVALID_CONCAT( OUString( "a" ) + static_cast<const char*>("b") )); char d[] = "b"; diff --git a/sal/qa/rtl/strings/test_strings_replace.cxx b/sal/qa/rtl/strings/test_strings_replace.cxx index 72e30db34df9..ddc60acda9d7 100644 --- a/sal/qa/rtl/strings/test_strings_replace.cxx +++ b/sal/qa/rtl/strings/test_strings_replace.cxx @@ -64,49 +64,49 @@ private: void Test::stringReplaceFirst() { CPPUNIT_ASSERT_EQUAL( - OString("otherbarfoo"), - OString("foobarfoo").replaceFirst("foo", "other")); + "otherbarfoo"_ostr, + "foobarfoo"_ostr.replaceFirst("foo"_ostr, "other"_ostr)); CPPUNIT_ASSERT_EQUAL( - OString("foobarfoo"), - OString("foobarfoo").replaceFirst("bars", "other")); + "foobarfoo"_ostr, + "foobarfoo"_ostr.replaceFirst("bars"_ostr, "other"_ostr)); { sal_Int32 n = 0; CPPUNIT_ASSERT_EQUAL( - OString("otherbarfoo"), - OString("foobarfoo").replaceFirst("foo", "other", &n)); + "otherbarfoo"_ostr, + "foobarfoo"_ostr.replaceFirst("foo"_ostr, "other"_ostr, &n)); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), n); } { sal_Int32 n = 1; CPPUNIT_ASSERT_EQUAL( - OString("foobarother"), - OString("foobarfoo").replaceFirst("foo", "other", &n)); + "foobarother"_ostr, + "foobarfoo"_ostr.replaceFirst("foo"_ostr, "other"_ostr, &n)); CPPUNIT_ASSERT_EQUAL(sal_Int32(6), n); } { sal_Int32 n = 4; CPPUNIT_ASSERT_EQUAL( - OString("foobarfoo"), - OString("foobarfoo").replaceFirst("bar", "other", &n)); + "foobarfoo"_ostr, + "foobarfoo"_ostr.replaceFirst("bar"_ostr, "other"_ostr, &n)); CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), n); } } void Test::stringReplaceAll() { CPPUNIT_ASSERT_EQUAL( - OString("otherbarother"), - OString("foobarfoo").replaceAll("foo", "other")); + "otherbarother"_ostr, + "foobarfoo"_ostr.replaceAll("foo"_ostr, "other"_ostr)); CPPUNIT_ASSERT_EQUAL( - OString("foobarfoo"), - OString("foobarfoo").replaceAll("bars", "other")); + "foobarfoo"_ostr, + "foobarfoo"_ostr.replaceAll("bars"_ostr, "other"_ostr)); CPPUNIT_ASSERT_EQUAL( - OString("xxa"), OString("xaa").replaceAll("xa", "xx")); + "xxa"_ostr, "xaa"_ostr.replaceAll("xa"_ostr, "xx"_ostr)); } void Test::ustringReplaceFirst() { |