summaryrefslogtreecommitdiff
path: root/i18npool/source/indexentry
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-09-05 13:53:35 +0200
committerEike Rathke <erack@redhat.com>2013-09-05 14:57:27 +0200
commit58eac0df5ff116766f6a1c154dd5fe22f0ed341c (patch)
tree5a54e038eb346fceac18ef7575a0ed2e5e073aec /i18npool/source/indexentry
parent8aca6db986b5e579ef15d636c5f495f3b78092cc (diff)
renamed LocaleData to LocaleDataImpl to prevent confusion
... between com::sun::star::i18n::LocaleData of com/sun/star/i18n/LocaleData.hpp and i18npool/inc/localedata.hxx Change-Id: Id23f67c1e3a654fd4f2886029ee45fcc1f466879
Diffstat (limited to 'i18npool/source/indexentry')
-rw-r--r--i18npool/source/indexentry/indexentrysupplier.cxx10
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_common.cxx2
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_default.cxx10
3 files changed, 11 insertions, 11 deletions
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx
index 9c5ab1736483..8cd16a1b0ff0 100644
--- a/i18npool/source/indexentry/indexentrysupplier.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier.cxx
@@ -35,12 +35,12 @@ IndexEntrySupplier::IndexEntrySupplier( const Reference < XComponentContext >& r
Sequence < Locale > SAL_CALL IndexEntrySupplier::getLocaleList() throw (RuntimeException)
{
- return LocaleData().getAllInstalledLocaleNames();
+ return LocaleDataImpl().getAllInstalledLocaleNames();
}
Sequence < OUString > SAL_CALL IndexEntrySupplier::getAlgorithmList( const Locale& rLocale ) throw (RuntimeException)
{
- return LocaleData().getIndexAlgorithm(rLocale);
+ return LocaleDataImpl().getIndexAlgorithm(rLocale);
}
sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, const OUString& SortAlgorithm,
@@ -58,7 +58,7 @@ sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, cons
sal_Bool SAL_CALL IndexEntrySupplier::usePhoneticEntry( const Locale& rLocale ) throw (RuntimeException)
{
- return LocaleData().hasPhonetic(rLocale);
+ return LocaleDataImpl().hasPhonetic(rLocale);
}
OUString SAL_CALL IndexEntrySupplier::getPhoneticCandidate( const OUString& rIndexEntry,
@@ -118,7 +118,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c
rLocale.Country == aLocale.Country && rLocale.Variant == aLocale.Variant)
return xIES;
else {
- LocaleData ld;
+ LocaleDataImpl ld;
aLocale = rLocale;
if (rSortAlgorithm.isEmpty())
aSortAlgorithm = ld.getDefaultIndexAlgorithm( rLocale );
@@ -167,7 +167,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c
OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePages,
const Locale& rLocale ) throw (RuntimeException)
{
- Sequence< OUString > aFollowPageWords = LocaleData().getFollowPageWords(rLocale);
+ Sequence< OUString > aFollowPageWords = LocaleDataImpl().getFollowPageWords(rLocale);
return (bMorePages && aFollowPageWords.getLength() > 1) ?
aFollowPageWords[1] : (aFollowPageWords.getLength() > 0 ?
diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx
index bd647b2b2476..e4dba3822821 100644
--- a/i18npool/source/indexentry/indexentrysupplier_common.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx
@@ -64,7 +64,7 @@ sal_Bool SAL_CALL IndexEntrySupplier_Common::usePhoneticEntry( const lang::Local
sal_Bool SAL_CALL IndexEntrySupplier_Common::loadAlgorithm( const lang::Locale& rLocale,
const OUString& rAlgorithm, sal_Int32 collatorOptions ) throw (RuntimeException)
{
- usePhonetic = LocaleData().isPhonetic(rLocale, rAlgorithm);
+ usePhonetic = LocaleDataImpl().isPhonetic(rLocale, rAlgorithm);
collator->loadCollatorAlgorithm(rAlgorithm, rLocale, collatorOptions);
aLocale = rLocale;
aAlgorithm = rAlgorithm;
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index eba5beed2c33..cb54e22b730a 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -163,11 +163,11 @@ OUString Index::getIndexDescription(const OUString& rIndexEntry)
void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) throw (RuntimeException)
{
- OUString keyStr = LocaleData().getIndexKeysByAlgorithm(rLocale, algorithm);
+ OUString keyStr = LocaleDataImpl().getIndexKeysByAlgorithm(rLocale, algorithm);
if (keyStr.isEmpty()) {
- keyStr = LocaleData().getIndexKeysByAlgorithm(LOCALE_EN,
- LocaleData().getDefaultIndexAlgorithm(LOCALE_EN));
+ keyStr = LocaleDataImpl().getIndexKeysByAlgorithm(LOCALE_EN,
+ LocaleDataImpl().getDefaultIndexAlgorithm(LOCALE_EN));
if (keyStr.isEmpty())
throw RuntimeException();
}
@@ -250,10 +250,10 @@ void Index::init(const lang::Locale &rLocale, const OUString& algorithm) throw (
{
makeIndexKeys(rLocale, algorithm);
- Sequence< UnicodeScript > scriptList = LocaleData().getUnicodeScripts( rLocale );
+ Sequence< UnicodeScript > scriptList = LocaleDataImpl().getUnicodeScripts( rLocale );
if (scriptList.getLength() == 0) {
- scriptList = LocaleData().getUnicodeScripts(LOCALE_EN);
+ scriptList = LocaleDataImpl().getUnicodeScripts(LOCALE_EN);
if (scriptList.getLength() == 0)
throw RuntimeException();
}