summaryrefslogtreecommitdiff
path: root/i18npool/source/indexentry
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-08-26 12:40:43 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-08-26 12:40:43 +0200
commit28cb2c1764f2365d69ce09cb69f0f5a676458a33 (patch)
tree614b44a9dc1b4928af5db1880e9869cd3e997eb1 /i18npool/source/indexentry
parent6a1bebcc890c04acdc79236ff54cdd49b27be71a (diff)
loplugin:refcounting: also cover temporaries being directly stack managed
Change-Id: Ib0f7c60df1d2fba0d4d9d3fa6faf3bb97867ebc0
Diffstat (limited to 'i18npool/source/indexentry')
-rw-r--r--i18npool/source/indexentry/indexentrysupplier.cxx8
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_common.cxx2
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_default.cxx10
3 files changed, 10 insertions, 10 deletions
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx
index 2ade78f958a4..cb06d7968329 100644
--- a/i18npool/source/indexentry/indexentrysupplier.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier.cxx
@@ -34,12 +34,12 @@ IndexEntrySupplier::IndexEntrySupplier( const Reference < XComponentContext >& r
Sequence < Locale > SAL_CALL IndexEntrySupplier::getLocaleList() throw (RuntimeException, std::exception)
{
- return LocaleDataImpl().getAllInstalledLocaleNames();
+ return LocaleDataImpl::get()->getAllInstalledLocaleNames();
}
Sequence < OUString > SAL_CALL IndexEntrySupplier::getAlgorithmList( const Locale& rLocale ) throw (RuntimeException, std::exception)
{
- return LocaleDataImpl().getIndexAlgorithm(rLocale);
+ return LocaleDataImpl::get()->getIndexAlgorithm(rLocale);
}
sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, const OUString& SortAlgorithm,
@@ -57,7 +57,7 @@ sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, cons
sal_Bool SAL_CALL IndexEntrySupplier::usePhoneticEntry( const Locale& rLocale ) throw (RuntimeException, std::exception)
{
- return LocaleDataImpl().hasPhonetic(rLocale);
+ return LocaleDataImpl::get()->hasPhonetic(rLocale);
}
OUString SAL_CALL IndexEntrySupplier::getPhoneticCandidate( const OUString& rIndexEntry,
@@ -167,7 +167,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c
OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePages,
const Locale& rLocale ) throw (RuntimeException, std::exception)
{
- Sequence< OUString > aFollowPageWords = LocaleDataImpl().getFollowPageWords(rLocale);
+ Sequence< OUString > aFollowPageWords = LocaleDataImpl::get()->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 74009b97e843..fafb3046d5b2 100644
--- a/i18npool/source/indexentry/indexentrysupplier_common.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx
@@ -63,7 +63,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, std::exception)
{
- usePhonetic = LocaleDataImpl().isPhonetic(rLocale, rAlgorithm);
+ usePhonetic = LocaleDataImpl::get()->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 6db7a116c0eb..ee0c3f5b6ab2 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -167,11 +167,11 @@ OUString Index::getIndexDescription(const OUString& rIndexEntry)
void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) throw (RuntimeException)
{
- OUString keyStr = LocaleDataImpl().getIndexKeysByAlgorithm(rLocale, algorithm);
+ OUString keyStr = LocaleDataImpl::get()->getIndexKeysByAlgorithm(rLocale, algorithm);
if (keyStr.isEmpty()) {
- keyStr = LocaleDataImpl().getIndexKeysByAlgorithm(LOCALE_EN,
- LocaleDataImpl().getDefaultIndexAlgorithm(LOCALE_EN));
+ keyStr = LocaleDataImpl::get()->getIndexKeysByAlgorithm(LOCALE_EN,
+ LocaleDataImpl::get()->getDefaultIndexAlgorithm(LOCALE_EN));
if (keyStr.isEmpty())
throw RuntimeException();
}
@@ -255,10 +255,10 @@ void Index::init(const lang::Locale &rLocale, const OUString& algorithm) throw (
{
makeIndexKeys(rLocale, algorithm);
- Sequence< UnicodeScript > scriptList = LocaleDataImpl().getUnicodeScripts( rLocale );
+ Sequence< UnicodeScript > scriptList = LocaleDataImpl::get()->getUnicodeScripts( rLocale );
if (scriptList.getLength() == 0) {
- scriptList = LocaleDataImpl().getUnicodeScripts(LOCALE_EN);
+ scriptList = LocaleDataImpl::get()->getUnicodeScripts(LOCALE_EN);
if (scriptList.getLength() == 0)
throw RuntimeException();
}