diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-15 12:36:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-15 12:36:11 +0100 |
| commit | 3210bc85ae1276350f18f4795efefe491c2206c2 (patch) | |
| tree | 75c8d5831620cdc1d0c9145ca4579197e5cf0d94 /tools | |
| parent | a0acad42105bc3f0304121a86f755958e38aeaac (diff) | |
Rename rtl::isValidCodePoint -> rtl::isUnicodeCodePoint
...and fix its documentation, and use it throughout the code base.
Change-Id: I349bc2009b1b0aa7115ea90bc6ecd0a812f63698
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 4 | ||||
| -rw-r--r-- | tools/source/inet/inetmime.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 6ebb517540ae..03e550e96421 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -4744,8 +4744,8 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, break; nShift -= 6; } - if (bUTF8 && nEncoded >= nMin - && nEncoded <= 0x10FFFF + if (bUTF8 && rtl::isUnicodeCodePoint(nEncoded) + && nEncoded >= nMin && !rtl::isHighSurrogate(nEncoded) && !rtl::isLowSurrogate(nEncoded)) { diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 88b9f99d2306..d0b638a66a99 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -270,7 +270,7 @@ sal_Char * convertFromUnicode(const sal_Unicode * pBegin, inline sal_Unicode * putUTF32Character(sal_Unicode * pBuffer, sal_uInt32 nUTF32) { - DBG_ASSERT(nUTF32 <= 0x10FFFF, "putUTF32Character(): Bad char"); + DBG_ASSERT(rtl::isUnicodeCodePoint(nUTF32), "putUTF32Character(): Bad char"); if (nUTF32 < 0x10000) *pBuffer++ = sal_Unicode(nUTF32); else @@ -375,7 +375,7 @@ bool translateUTF8Char(const sal_Char *& rBegin, else return false; - if (nUCS4 < nMin || nUCS4 > 0x10FFFF) + if (!rtl::isUnicodeCodePoint(nUCS4) || nUCS4 < nMin) return false; if (eEncoding >= RTL_TEXTENCODING_UCS4) @@ -1279,7 +1279,7 @@ void INetMIMEEncodedWordOutputSink::finish(bool bWriteTrailer) if (bEscape) { DBG_ASSERT( - nUTF32 < 0x10FFFF, + rtl::isUnicodeCodePoint(nUTF32), "INetMIMEEncodedWordOutputSink::finish():" " Bad char"); if (nUTF32 < 0x80) |