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 /sal/textenc | |
| 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 'sal/textenc')
| -rw-r--r-- | sal/textenc/tcvtutf8.cxx | 2 | ||||
| -rw-r--r-- | sal/textenc/unichars.hxx | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sal/textenc/tcvtutf8.cxx b/sal/textenc/tcvtutf8.cxx index 1f0b2bfc96ef..f9c9879c54a3 100644 --- a/sal/textenc/tcvtutf8.cxx +++ b/sal/textenc/tcvtutf8.cxx @@ -163,7 +163,7 @@ sal_Size ImplConvertUtf8ToUnicode( *pDestBufPtr++ = (sal_Unicode) nUtf32; else goto no_output; - else if (nUtf32 <= 0x10FFFF) + else if (rtl::isUnicodeCodePoint(nUtf32)) if (pDestBufEnd - pDestBufPtr >= 2) { *pDestBufPtr++ = (sal_Unicode) ImplGetHighSurrogate(nUtf32); diff --git a/sal/textenc/unichars.hxx b/sal/textenc/unichars.hxx index 09652b98ce57..0bcd6f710518 100644 --- a/sal/textenc/unichars.hxx +++ b/sal/textenc/unichars.hxx @@ -20,9 +20,12 @@ #ifndef INCLUDED_SAL_TEXTENC_UNICHARS_HXX #define INCLUDED_SAL_TEXTENC_UNICHARS_HXX -#include "sal/config.h" +#include <sal/config.h> + #include <cassert> -#include "sal/types.h" + +#include <rtl/character.hxx> +#include <sal/types.h> #define RTL_TEXTENC_UNICODE_REPLACEMENT_CHARACTER 0xFFFD @@ -30,7 +33,7 @@ inline bool ImplIsNoncharacter(sal_uInt32 nUtf32) { return (nUtf32 >= 0xFDD0 && nUtf32 <= 0xFDEF) || (nUtf32 & 0xFFFF) >= 0xFFFE - || nUtf32 > 0x10FFFF; + || !rtl::isUnicodeCodePoint(nUtf32); } // All code points that are noncharacters, as of Unicode 3.1.1. |