From e84b6756255aa6b04491b9b6cfe68bd70a3d0191 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 31 Jan 2006 17:35:45 +0000 Subject: [PATCH] INTEGRATION: CWS i18n24 (1.8.36); FILE MERGED 2006/01/10 22:49:12 khong 1.8.36.1: #i60331 create seperate collator data library --- i18npool/source/collator/collatorImpl.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index 90d342901695..7aac83148de7 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -4,9 +4,9 @@ * * $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 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); if (cachedItem) - cachedItem->xC->loadCollatorAlgorithm(cachedItem->service, nLocale = rLocale, collatorOptions); + cachedItem->xC->loadCollatorAlgorithm(cachedItem->algorithm, nLocale = rLocale, collatorOptions); else throw RuntimeException(); // impl could not be loaded @@ -227,7 +227,7 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS // load service with name __ createCollator(rLocale, aBuf.append(rLocale.Language).append(under).append(rSortAlgorithm).makeStringAndClear(), rSortAlgorithm)) || - // load service with name + // load service with name _ (a > 0 && createCollator(rLocale, rSortAlgorithm, rSortAlgorithm)) || // load default service with name _Unicode