INTEGRATION: CWS i18n20 (1.7.32); FILE MERGED
2005/08/26 23:40:46 khong 1.7.32.1: #i45171# use new collation option for index grouping
This commit is contained in:
parent
1ac6f0d90d
commit
599c26fdcf
1 changed files with 4 additions and 4 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: indexentrysupplier_default.cxx,v $
|
||||
*
|
||||
* $Revision: 1.8 $
|
||||
* $Revision: 1.9 $
|
||||
*
|
||||
* last change: $Author: rt $ $Date: 2005-09-07 17:09:57 $
|
||||
* last change: $Author: rt $ $Date: 2005-10-17 15:43:54 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -87,7 +87,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_Unicode::compareIndexEntry(
|
|||
OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexCharacter( const OUString& rIndexEntry,
|
||||
const lang::Locale& rLocale, const OUString& rAlgorithm ) throw (RuntimeException) {
|
||||
|
||||
if (loadAlgorithm( rLocale, rAlgorithm, CollatorOptions::CollatorOptions_IGNORE_CASE))
|
||||
if (loadAlgorithm( rLocale, rAlgorithm, CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT))
|
||||
return index->getIndexDescription(rIndexEntry);
|
||||
else
|
||||
return IndexEntrySupplier_Common::getIndexCharacter(rIndexEntry, rLocale, rAlgorithm);
|
||||
|
@ -222,7 +222,7 @@ void Index::init(const lang::Locale &rLocale, const OUString& algorithm) throw (
|
|||
if (table_count > MAX_TABLES)
|
||||
throw RuntimeException();
|
||||
|
||||
collator->loadCollatorAlgorithm(algorithm, rLocale, CollatorOptions::CollatorOptions_IGNORE_CASE);
|
||||
collator->loadCollatorAlgorithm(algorithm, rLocale, CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT);
|
||||
sal_Int16 j=0;
|
||||
sal_Unicode start = unicode::getUnicodeScriptStart((UnicodeScript)0);
|
||||
sal_Unicode end = unicode::getUnicodeScriptEnd((UnicodeScript)0);
|
||||
|
|
Loading…
Reference in a new issue