diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-07-01 23:21:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-07-01 23:21:17 +0200 |
| commit | 4f90623dba6a211e7b4c9e98def91605627c5072 (patch) | |
| tree | dfd149b4a968abe9a9c30fb59910387d0e8a30f3 /sal/rtl/string.cxx | |
| parent | a402fd0d520108ec62b170415b6bc7b04716e3b4 (diff) | |
Clean up surrogates.hxx
Change-Id: I0eae089be1bde9db822a77bea482c10650c8a137
Diffstat (limited to 'sal/rtl/string.cxx')
| -rw-r--r-- | sal/rtl/string.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx index 9a651b65617a..28039720d1ec 100644 --- a/sal/rtl/string.cxx +++ b/sal/rtl/string.cxx @@ -138,7 +138,7 @@ static int rtl_ImplGetFastUTF8ByteLen( const sal_Unicode* pStr, sal_Int32 nLen ) n += 2; else { - if ( !SAL_RTL_IS_HIGH_SURROGATE(c) ) + if ( !isHighSurrogate(c) ) n += 3; else { @@ -147,9 +147,9 @@ static int rtl_ImplGetFastUTF8ByteLen( const sal_Unicode* pStr, sal_Int32 nLen ) if ( pStr+1 < pEndStr ) { c = *(pStr+1); - if ( SAL_RTL_IS_LOW_SURROGATE(c) ) + if ( isLowSurrogate(c) ) { - nUCS4Char = SAL_RTL_COMBINE_SURROGATES(nUCS4Char, c); + nUCS4Char = combineSurrogates(nUCS4Char, c); pStr++; } } |