diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-20 13:50:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-20 13:51:19 +0200 |
| commit | 9561c2f6793bede6e5092c36a4f1c8dbb782c4f4 (patch) | |
| tree | cb448ab79c6075f9109120f678da78267891bb7b /tools | |
| parent | d0d8e0a2a7244814f783f16c6c8b342fe6d16e79 (diff) | |
Clean up new rtl/surrogates.h
Change-Id: Iec781bdbbf216cb14c9ba5be5955123273d7699c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 4dfe58895bce..08c0c6da5a7e 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -31,7 +31,6 @@ #include <osl/file.hxx> #include <rtl/character.hxx> #include <rtl/string.h> -#include <rtl/surrogates.h> #include <rtl/textenc.h> #include <rtl/ustring.hxx> #include <sal/types.h> @@ -4778,9 +4777,9 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, nShift -= 6; } if (bUTF8 && nEncoded >= nMin - && !isHighSurrogate(nEncoded) - && !isLowSurrogate(nEncoded) - && nEncoded <= 0x10FFFF) + && nEncoded <= 0x10FFFF + && !rtl::isHighSurrogate(nEncoded) + && !rtl::isLowSurrogate(nEncoded)) { rBegin = p; nUTF32 = nEncoded; |