From 3f0fba004badec01e536ca0fe2889e7e0bb93d7a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 13 Sep 2017 13:35:49 +0200 Subject: 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 --- stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'stoc/source/uriproc') diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index c57670e27f20..6df3cd3e33ca 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -110,8 +110,8 @@ OUString parsePart( } encoded |= (n & 0x3F) << shift; } - if (!utf8 || !rtl::isUnicodeCodePoint(encoded) || encoded < min - || (encoded >= 0xD800 && encoded <= 0xDFFF)) + if (!utf8 || !rtl::isUnicodeScalarValue(encoded) + || encoded < min) { break; } -- cgit