mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop StringCompare from vcl

Browse Source 
Change-Id: If41503f382115affb42068d9a441241543197147
This commit is contained in:
Caolán McNamara
2013-10-21 09:53:30 +01:00
parent d486b2b324
commit df29825ec6
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vcl/source/control/ilstbox.cxx
View File

@@ -184,12 +184,10 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry
try try
{ {
// XXX even though XCollator::compareString returns a sal_Int32 the only sal_Int32 nComp = rSorter.compare(rStr, pTemp->maStr);
// defined values are {-1, 0, 1} which is compatible with StringCompare
StringCompare eComp = (StringCompare)rSorter.compare(rStr, pTemp->maStr);
// fast insert for sorted data // fast insert for sorted data
if ( eComp != COMPARE_LESS ) if ( nComp >= 0 )
{ {
insPos = maEntries.size(); insPos = maEntries.size();
maEntries.push_back(pNewEntry); maEntries.push_back(pNewEntry);
@@ -199,8 +197,8 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry
nLow = mnMRUCount; nLow = mnMRUCount;
pTemp = (ImplEntryType*)GetEntry( (sal_uInt16)nLow ); pTemp = (ImplEntryType*)GetEntry( (sal_uInt16)nLow );
eComp = (StringCompare)rSorter.compare(rStr, pTemp->maStr); nComp = rSorter.compare(rStr, pTemp->maStr);
if ( eComp != COMPARE_GREATER ) if ( nComp <= 0 )
{ {
insPos = 0; insPos = 0;
maEntries.insert(maEntries.begin(),pNewEntry); maEntries.insert(maEntries.begin(),pNewEntry);
@@ -214,13 +212,13 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry
nMid = (nLow + nHigh) / 2; nMid = (nLow + nHigh) / 2;
pTemp = (ImplEntryType*)GetEntry( nMid ); pTemp = (ImplEntryType*)GetEntry( nMid );
eComp = (StringCompare)rSorter.compare(rStr, pTemp->maStr); nComp = rSorter.compare(rStr, pTemp->maStr);
if ( eComp == COMPARE_LESS ) if ( nComp < 0 )
nHigh = nMid-1; nHigh = nMid-1;
else else
{ {
if ( eComp == COMPARE_GREATER ) if ( nComp > 0 )
nLow = nMid + 1; nLow = nMid + 1;
else else
break; break;
@@ -228,7 +226,7 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry
} }
while ( nLow <= nHigh ); while ( nLow <= nHigh );
if ( eComp != COMPARE_LESS ) if ( nComp >= 0 )
nMid++; nMid++;
insPos = nMid; insPos = nMid;