From 73342dbb82ba074d01962359dac50fb2aa36cbeb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 21 Nov 2013 15:52:45 +0200 Subject: remove unnecessary RTL_CONSTASCII_STRINGPARAM A final pass through the code, converting code to use the new OUString and OString methods that can detect string literals. Change-Id: Ifa6382335e5650a1c67e52006b26354e0692c710 --- sal/osl/w32/procimpl.cxx | 6 +++--- sal/rtl/bootstrap.cxx | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'sal') diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index dcf6af8274e2..f056ce191771 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -372,9 +372,9 @@ namespace /* private */ bool is_batch_file(const rtl::OUString& file_name) { rtl::OUString ext = get_file_extension(file_name); - return (ext.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("bat")) || - ext.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("cmd")) || - ext.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("btm"))); + return (ext.equalsIgnoreAsciiCase("bat") || + ext.equalsIgnoreAsciiCase("cmd") || + ext.equalsIgnoreAsciiCase("btm")); } //########################################################## diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 0d47a7b6ef72..a1ff682de1dc 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -67,8 +67,7 @@ namespace { static char const VND_SUN_STAR_PATHNAME[] = "vnd.sun.star.pathname:"; bool isPathnameUrl(rtl::OUString const & url) { - return url.matchIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM(VND_SUN_STAR_PATHNAME)); + return url.matchIgnoreAsciiCase(VND_SUN_STAR_PATHNAME); } bool resolvePathnameUrl(rtl::OUString * url) { -- cgit