sal/osl/unx/file.cxx | 2 sal/osl/unx/pipe.cxx | 2 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 1346 ++++++++++++++-------------- sal/qa/osl/file/osl_File.cxx | 172 +-- sal/qa/osl/process/osl_process.cxx | 6 sal/qa/rtl/cipher/rtl_cipher.cxx | 16 sal/qa/rtl/digest/rtl_digest.cxx | 136 +- sal/qa/rtl/ostring/rtl_str.cxx | 112 +- sal/qa/rtl/oustring/rtl_OUString2.cxx | 56 - sal/qa/rtl/oustring/rtl_ustr.cxx | 22 sal/qa/rtl/strings/nonconstarray.cxx | 4 sal/qa/rtl/strings/test_ostring.cxx | 42 sal/qa/rtl/strings/test_ostring_concat.cxx | 86 - sal/qa/rtl/strings/test_oustring_concat.cxx | 2 sal/qa/rtl/strings/test_strings_replace.cxx | 30 15 files changed, 1017 insertions(+), 1017 deletions(-)
New commits: commit 95ffa27c593a7fa31309b5e72a55d966862db9a0 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Sun Nov 19 17:32:08 2023 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Sun Nov 19 21:19:40 2023 +0100 Extended loplugin:ostr: sal Change-Id: Ic8a02784acb9f8981249689541bb6cba1b7fbfb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159682 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> 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; ... etc. - the rest is truncated