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 /svl | |
| parent | a2fea109e6454b10e8e85148b93bdca89066fe8d (diff) | |
duplicate surrogate code
Change-Id: I9fad024e4b5c8a4ca272f2387df07351198cf5dc
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/misc/urihelper.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 362b6273c3e4..7d7cc2c90cbf 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -36,13 +36,14 @@ #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <comphelper/processfactory.hxx> #include <osl/diagnose.h> +#include <rtl/instance.hxx> +#include <rtl/surrogates.h> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/types.h> #include <tools/inetmime.hxx> #include <unotools/charclass.hxx> -#include <rtl/instance.hxx> using namespace com::sun::star; @@ -280,9 +281,9 @@ namespace { inline sal_Int32 nextChar(OUString const & rStr, sal_Int32 nPos) { - return INetMIME::isHighSurrogate(rStr[nPos]) + return isHighSurrogate(rStr[nPos]) && rStr.getLength() - nPos >= 2 - && INetMIME::isLowSurrogate(rStr[nPos + 1]) ? + && isLowSurrogate(rStr[nPos + 1]) ? nPos + 2 : nPos + 1; } |