diff options
| -rw-r--r-- | ucb/source/regexp/regexp.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index fae2aee293be..28e59401856a 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -67,13 +67,7 @@ bool matchStringIgnoreCase(sal_Unicode const ** pBegin, while (q != qEnd) { - sal_Unicode c1 = *p++; - sal_Unicode c2 = *q++; - if (c1 >= 'a' && c1 <= 'z') - c1 -= 'a' - 'A'; - if (c2 >= 'a' && c2 <= 'z') - c2 -= 'a' - 'A'; - if (c1 != c2) + if (rtl::compareIgnoreAsciiCase(*p++, *q++) != 0) return false; } @@ -183,7 +177,7 @@ bool isScheme(OUString const & rString, bool bColon) if (p == pEnd) return !bColon; sal_Unicode c = *p++; - if (!(rtl::isAsciiAlpha(c) || rtl::isAsciiDigit(c) + if (!(rtl::isAsciiAlphanumeric(c) || c == '+' || c == '-' || c == '.')) return bColon && c == ':' && p == pEnd; } |