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 /sw/source | |
parent | d0d8e0a2a7244814f783f16c6c8b342fe6d16e79 (diff) |
Clean up new rtl/surrogates.h
Change-Id: Iec781bdbbf216cb14c9ba5be5955123273d7699c
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 5bb17c9a2b9f..104052a2c841 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -79,7 +79,7 @@ #include <IMark.hxx> #include <unotools/fltrcfg.hxx> -#include <rtl/surrogates.h> +#include <rtl/character.hxx> #include <xmloff/odffields.hxx> #include <stdio.h> @@ -500,16 +500,17 @@ OUString sanitizeString(const OUString& rString) while (i < rString.getLength()) { sal_Unicode c = rString[i]; - if (isHighSurrogate(c)) + if (rtl::isHighSurrogate(c)) { - if (i+1 == rString.getLength() || !isLowSurrogate(rString[i+1])) + if (i+1 == rString.getLength() + || !rtl::isLowSurrogate(rString[i+1])) { SAL_WARN("sw.ww8", "Surrogate error: high without low"); return rString.copy(0, i); } ++i; //skip correct low } - if (isLowSurrogate(c)) //bare low without preceeding high + if (rtl::isLowSurrogate(c)) //bare low without preceeding high { SAL_WARN("sw.ww8", "Surrogate error: low without high"); return rString.copy(0, i); |