diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-13 13:35:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-13 13:35:49 +0200 |
| commit | 3f0fba004badec01e536ca0fe2889e7e0bb93d7a (patch) | |
| tree | cdf682e89f56c29fd6a8cd650bdb8bba42eca555 /tools | |
| parent | 2d22b39fb7ddbb02f246e2943b228931e5d583e1 (diff) | |
New rtl::isUnicodeScalarValue, rtl::isSurrogate
There are apparently various places that want to check for a Unicode scalar
value rather than for a Unicode code point. Changed those uses of
rtl::isUnicodeCodePoint where that was obvious. (For changing
svtools/source/svrtf/svparser.cxx see 8e0fb74dc01927b60d8b868548ef8fe1d7a80ce3
"Revert 'svtools: HTML import: don't put lone surrogates in OUString'".) Other
uses of rtl::isUnicodeCodePoint might also want to use rtl::isUnicodeScalarValue
instead.
As a side effect, this change also introduces rtl::isSurrogate, which is useful
in a few places as well.
Change-Id: I9245f4f98b83877145a4d392f0ddb7c5d824a535
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index eeadb7df38d2..ccebbd3f4e2a 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -4745,10 +4745,8 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, break; nShift -= 6; } - if (bUTF8 && rtl::isUnicodeCodePoint(nEncoded) - && nEncoded >= nMin - && !rtl::isHighSurrogate(nEncoded) - && !rtl::isLowSurrogate(nEncoded)) + if (bUTF8 && rtl::isUnicodeScalarValue(nEncoded) + && nEncoded >= nMin) { rBegin = p; nUTF32 = nEncoded; |