diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-28 15:56:18 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-28 15:56:18 +0200 |
| commit | 2b03086e2e34909791b51f106b0d356a517ce137 (patch) | |
| tree | 068f804c951961a7ce0181ab360bfa2d64941d72 /i18npool | |
| parent | 62b76b304b04ff16da5e5f801bba791861feab18 (diff) | |
| parent | 7b61472c31a9f01fb6c967e3191455681827aa16 (diff) | |
CWS-TOOLING: integrate CWS calc66
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/transliteration/transliterationImpl.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 2109c310b233..7506ec5c15aa 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -43,6 +43,8 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> +#include <algorithm> + #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #endif @@ -474,24 +476,25 @@ TransliterationImpl::equals( OUString tmpStr1 = folding(str1, pos1, nCount1, offset1); OUString tmpStr2 = folding(str2, pos2, nCount2, offset2); + // Length of offset1 and offset2 may still be 0 if there was no folding + // necessary! const sal_Unicode *p1 = tmpStr1.getStr(); const sal_Unicode *p2 = tmpStr2.getStr(); - sal_Int32 i, nLen = (tmpStr1.getLength() < tmpStr1.getLength() ? - tmpStr1.getLength() : tmpStr2.getLength()); + sal_Int32 i, nLen = ::std::min( tmpStr1.getLength(), tmpStr2.getLength()); for (i = 0; i < nLen; ++i, ++p1, ++p2 ) { if (*p1 != *p2) { // return number of matched code points so far - nMatch1 = offset1[i]; - nMatch2 = offset2[i]; + nMatch1 = (i < offset1.getLength()) ? offset1[i] : i; + nMatch2 = (i < offset2.getLength()) ? offset2[i] : i; return sal_False; } } // i==nLen if ( tmpStr1.getLength() != tmpStr2.getLength() ) { // return number of matched code points so far - nMatch1 = offset1[i-1] + 1; - nMatch2 = offset2[i-1] + 1; + nMatch1 = (i <= offset1.getLength()) ? offset1[i-1] + 1 : i; + nMatch2 = (i <= offset2.getLength()) ? offset2[i-1] + 1 : i; return sal_False; } else { nMatch1 = nCount1; |