diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-20 09:52:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-20 10:09:58 +0100 |
| commit | fd8c06aded20cfd6b4f9c729cec120c0d2d574aa (patch) | |
| tree | 3c0d558218456ba87a2858019defcce0ed4c235a /tools | |
| parent | a2fea109e6454b10e8e85148b93bdca89066fe8d (diff) | |
duplicate surrogate code
Change-Id: I9fad024e4b5c8a4ca272f2387df07351198cf5dc
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index f6cbcef56fc2..4dfe58895bce 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -31,6 +31,7 @@ #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> @@ -4777,8 +4778,8 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, nShift -= 6; } if (bUTF8 && nEncoded >= nMin - && !INetMIME::isHighSurrogate(nEncoded) - && !INetMIME::isLowSurrogate(nEncoded) + && !isHighSurrogate(nEncoded) + && !isLowSurrogate(nEncoded) && nEncoded <= 0x10FFFF) { rBegin = p; |