diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-19 11:32:06 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-19 11:32:20 +0100 |
commit | 4c0c23af21db0b72541674c2352df04f48774e81 (patch) | |
tree | fe5697fbc7f793de73531e50711c5b39d9825923 /forms | |
parent | 8f2cf65ec9a450441b92ed1f638eda26231a9be7 (diff) |
Simplify equalsIgnoreAsciiCaseAscii[L] calls
Change-Id: If5201bd772aed245e8f7f8b900d76ffe4ca57b49
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/Filter.cxx | 6 | ||||
-rw-r--r-- | forms/source/xforms/submission.cxx | 8 | ||||
-rw-r--r-- | forms/source/xforms/submission/replace.cxx | 8 | ||||
-rw-r--r-- | forms/source/xforms/xpathlib/xpathlib.cxx | 12 |
4 files changed, 17 insertions, 17 deletions
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index d2bc3239260b..706e17e0afd5 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -580,13 +580,13 @@ namespace frm { Any aValue; if ( aText == "1" - || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("TRUE")) - || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("IS TRUE")) + || aText.equalsIgnoreAsciiCase("TRUE") + || aText.equalsIgnoreAsciiCase("IS TRUE") ) { aValue <<= (sal_Int32)STATE_CHECK; } - else if ( aText == "0" || aText.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("FALSE")) ) + else if ( aText == "0" || aText.equalsIgnoreAsciiCase("FALSE") ) { aValue <<= (sal_Int32)STATE_NOCHECK; } diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index cc4d8ddcb52d..d8bb867d3b13 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -309,17 +309,17 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler ) // strip whitespace-only text node for get submission Reference< XDocumentFragment > aFragment = createSubmissionDocument( - xResult, aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("get"))); + xResult, aMethod.equalsIgnoreAsciiCase("get")); // submit result; set encoding, etc. auto_ptr<CSubmission> xSubmission; - if (aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("PUT"))) + if (aMethod.equalsIgnoreAsciiCase("PUT")) xSubmission = auto_ptr<CSubmission>( new CSubmissionPut( getAction(), aFragment)); - else if (aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("post"))) + else if (aMethod.equalsIgnoreAsciiCase("post")) xSubmission = auto_ptr<CSubmission>( new CSubmissionPost( getAction(), aFragment)); - else if (aMethod.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("get"))) + else if (aMethod.equalsIgnoreAsciiCase("get")) xSubmission = auto_ptr<CSubmission>( new CSubmissionGet( getAction(), aFragment)); else diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 27bcd4baee84..543c6d0bb515 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -51,8 +51,8 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla try { Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); - if (aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("all")) - || aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("document"))) { + if (aReplace.equalsIgnoreAsciiCase("all") + || aReplace.equalsIgnoreAsciiCase("document")) { Reference< XComponentLoader > xLoader; if (aFrame.is()) xLoader = Reference< XComponentLoader >(aFrame, UNO_QUERY); @@ -74,7 +74,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla return CSubmission::SUCCESS; - } else if (aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("instance"))) { + } else if (aReplace.equalsIgnoreAsciiCase("instance")) { if (aDocument.is()) { // parse the result stream into a new document Reference< XDocumentBuilder > xBuilder(DocumentBuilder::create(xContext)); @@ -95,7 +95,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla // nothing to replace return CSubmission::UNKNOWN_ERROR; } - } else if (aReplace.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("none"))) { + } else if (aReplace.equalsIgnoreAsciiCase("none")) { // do nothing \o/ return CSubmission::SUCCESS; } diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx index 8a915c45aa0b..315e42933f34 100644 --- a/forms/source/xforms/xpathlib/xpathlib.cxx +++ b/forms/source/xforms/xpathlib/xpathlib.cxx @@ -93,11 +93,11 @@ void xforms_booleanFromStringFunction(xmlXPathParserContextPtr ctxt, int nargs) xmlChar *pString = xmlXPathPopString(ctxt); if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE); ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); - if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true")) || - aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("1"))) + if (aString.equalsIgnoreAsciiCase("true") || + aString.equalsIgnoreAsciiCase("1")) xmlXPathReturnTrue(ctxt); - else if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("false")) || - aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("0"))) + else if (aString.equalsIgnoreAsciiCase("false") || + aString.equalsIgnoreAsciiCase("0")) xmlXPathReturnFalse(ctxt); else XP_ERROR(XPATH_NUMBER_ERROR); @@ -225,9 +225,9 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs) xmlChar* pString = xmlXPathPopString(ctxt); if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE); ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); - if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("version"))) + if (aString.equalsIgnoreAsciiCase("version")) xmlXPathReturnString(ctxt, (xmlChar*)_version); - else if (aString.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("conformance-level"))) + else if (aString.equalsIgnoreAsciiCase("conformance-level")) xmlXPathReturnString(ctxt, (xmlChar*)_conformance); else xmlXPathReturnEmptyString(ctxt); |