diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /desktop | |
parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/qa/deployment_misc/test_dp_version.cxx | 14 | ||||
-rw-r--r-- | desktop/unx/source/officeloader/officeloader.cxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx index 8816d068289a..a0c093953e76 100644 --- a/desktop/qa/deployment_misc/test_dp_version.cxx +++ b/desktop/qa/deployment_misc/test_dp_version.cxx @@ -48,17 +48,17 @@ void Test::test() { }; static Data const data[] = { { rtl::OUString(), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.0000.00.0")), + rtl::OUString("0.0000.00.0"), ::dp_misc::EQUAL }, - { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".01")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.1")), + { rtl::OUString(".01"), + rtl::OUString("0.1"), ::dp_misc::EQUAL }, - { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2")), + { rtl::OUString("10"), + rtl::OUString("2"), ::dp_misc::GREATER }, - { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("9223372036854775808")), + { rtl::OUString("9223372036854775808"), // 2^63 - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("9223372036854775807")), + rtl::OUString("9223372036854775807"), ::dp_misc::GREATER } }; for (::std::size_t i = 0; i < sizeof data / sizeof (Data); ++i) { diff --git a/desktop/unx/source/officeloader/officeloader.cxx b/desktop/unx/source/officeloader/officeloader.cxx index ffeb643fb179..ba8eb064dc06 100644 --- a/desktop/unx/source/officeloader/officeloader.cxx +++ b/desktop/unx/source/officeloader/officeloader.cxx @@ -37,7 +37,7 @@ SAL_IMPLEMENT_MAIN() osl_getExecutableFile( &sExecutableFile.pData ); - sExecutableFile += OUString( RTL_CONSTASCII_USTRINGPARAM(".bin") ); + sExecutableFile += OUString(".bin"); nCommandArgs = osl_getCommandArgCount(); pCommandArgs = new rtl_uString *[nCommandArgs]; |