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 /svl | |
| parent | d0d8e0a2a7244814f783f16c6c8b342fe6d16e79 (diff) | |
Clean up new rtl/surrogates.h
Change-Id: Iec781bdbbf216cb14c9ba5be5955123273d7699c
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/misc/urihelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 7d7cc2c90cbf..06936b8bc76f 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -36,8 +36,8 @@ #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <comphelper/processfactory.hxx> #include <osl/diagnose.h> +#include <rtl/character.hxx> #include <rtl/instance.hxx> -#include <rtl/surrogates.h> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> @@ -281,9 +281,9 @@ namespace { inline sal_Int32 nextChar(OUString const & rStr, sal_Int32 nPos) { - return isHighSurrogate(rStr[nPos]) + return rtl::isHighSurrogate(rStr[nPos]) && rStr.getLength() - nPos >= 2 - && isLowSurrogate(rStr[nPos + 1]) ? + && rtl::isLowSurrogate(rStr[nPos + 1]) ? nPos + 2 : nPos + 1; } |