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

INTEGRATION: CWS i18n24 (1.8.36); FILE MERGED

Browse source 
2006/01/10 22:49:12 khong 1.8.36.1: #i60331 create seperate collator data library
This commit is contained in:
Kurt Zenker 2006-01-31 17:35:45 +00:00
parent e9d471c88a
commit e84b675625
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
i18npool/source/collator/collatorImpl.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: collatorImpl.cxx,v $ * $RCSfile: collatorImpl.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: rt $ $Date: 2005-09-07 17:06:53 $ * last change: $Author: kz $ $Date: 2006-01-31 18:35:45 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -108,7 +108,7 @@ CollatorImpl::loadCollatorAlgorithm(const OUString& impl, const lang::Locale& rL
loadCachedCollator(rLocale, impl); loadCachedCollator(rLocale, impl);
if (cachedItem) if (cachedItem)
cachedItem->xC->loadCollatorAlgorithm(cachedItem->service, nLocale = rLocale, collatorOptions); cachedItem->xC->loadCollatorAlgorithm(cachedItem->algorithm, nLocale = rLocale, collatorOptions);
else else
throw RuntimeException(); // impl could not be loaded throw RuntimeException(); // impl could not be loaded
@ -227,7 +227,7 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS
// load service with name <base>_<lang>_<algorithm> // load service with name <base>_<lang>_<algorithm>
createCollator(rLocale, aBuf.append(rLocale.Language).append(under).append(rSortAlgorithm).makeStringAndClear(), createCollator(rLocale, aBuf.append(rLocale.Language).append(under).append(rSortAlgorithm).makeStringAndClear(),
rSortAlgorithm)) || rSortAlgorithm)) ||
// load service with name <algorithm> // load service with name <base>_<algorithm>
(a > 0 && (a > 0 &&
createCollator(rLocale, rSortAlgorithm, rSortAlgorithm)) || createCollator(rLocale, rSortAlgorithm, rSortAlgorithm)) ||
// load default service with name <base>_Unicode // load default service with name <base>_Unicode