diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-21 11:53:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-22 08:29:29 +0200 |
| commit | 4af6c0948be47d7816eb1b6f2137b70aba639f0d (patch) | |
| tree | 3965a1709f531229a6faaeef2e9d4026a30332b8 /i18npool/source/collator | |
| parent | Also handle OUString with non-RTL_TEXTENCODING_ASCII_US encoding (diff) | |
| download | core-4af6c0948be47d7816eb1b6f2137b70aba639f0d.tar.gz core-4af6c0948be47d7816eb1b6f2137b70aba639f0d.zip | |
loplugin:flatten in filter..i18npool
Change-Id: I9024b8b614a4de83a4d927e1918f6d4904a7fccb
Reviewed-on: https://gerrit.libreoffice.org/42592
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool/source/collator')
| -rw-r--r-- | i18npool/source/collator/collatorImpl.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index 38bca648f27f..022071a9b904 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -88,10 +88,9 @@ CollatorImpl::loadCollatorAlgorithm(const OUString& impl, const lang::Locale& rL if (! cachedItem || ! cachedItem->equals(rLocale, impl)) loadCachedCollator(rLocale, impl); - if (cachedItem) - cachedItem->xC->loadCollatorAlgorithm(cachedItem->algorithm, nLocale = rLocale, collatorOptions); - else + if (!cachedItem) throw RuntimeException(); // impl could not be loaded + cachedItem->xC->loadCollatorAlgorithm(cachedItem->algorithm, nLocale = rLocale, collatorOptions); return 0; } |