diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-23 18:39:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-24 15:27:28 +0200 |
| commit | 6390d2c52b75b2868d5ee98863a0af4f103c12e5 (patch) | |
| tree | ed9f11baf9f45d2de0270eb1a61983fb4a302df9 /ucb | |
| parent | 3fb56b38c46849569fe2035a3f377a396e2ec8fd (diff) | |
Get rid of comphelper::string::is*Ascii functions
Change-Id: I99912112e5b009d7a143f9816d757cdf6ebb1783
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/regexp/regexp.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 4b055a1448bb..41254c95f1d9 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -23,9 +23,9 @@ #include "osl/diagnose.h" #include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <rtl/character.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> -#include <comphelper/string.hxx> namespace unnamed_ucb_regexp {} using namespace unnamed_ucb_regexp; // unnamed namespaces don't work well yet... @@ -178,19 +178,17 @@ namespace unnamed_ucb_regexp { bool isScheme(OUString const & rString, bool bColon) { - using comphelper::string::isalphaAscii; - using comphelper::string::isdigitAscii; // Return true if rString matches <scheme> (plus a trailing ":" if bColon // is true) from RFC 2396: sal_Unicode const * p = rString.getStr(); sal_Unicode const * pEnd = p + rString.getLength(); - if (p != pEnd && isalphaAscii(*p)) + if (p != pEnd && rtl::isAsciiAlpha(*p)) for (++p;;) { if (p == pEnd) return !bColon; sal_Unicode c = *p++; - if (!(isalphaAscii(c) || isdigitAscii(c) + if (!(rtl::isAsciiAlpha(c) || rtl::isAsciiDigit(c) || c == '+' || c == '-' || c == '.')) return bColon && c == ':' && p == pEnd; } |