strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS calc66

Browse source
This commit is contained in:
Ivo Hinkelmann 2011-03-28 15:56:18 +02:00
commit 2b03086e2e
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
i18npool/source/transliteration/transliterationImpl.cxx
View file

@ -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;