diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-17 09:02:13 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-19 07:42:14 +0100 |
commit | 9656150f313229533a291eefd1bf33986bb19730 (patch) | |
tree | 0eb8a48678e2574fd9ff4eec30a8ac26ed844502 /i18npool | |
parent | 4c4b05b762e511bc466105be252fb3cecf2307ad (diff) |
loplugin:singlevalfields
Change-Id: If21bdaa8431a4d40bbf70a6e9a119d77a3596012
Reviewed-on: https://gerrit.libreoffice.org/63487
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool')
-rw-r--r-- | i18npool/inc/collator_unicode.hxx | 1 | ||||
-rw-r--r-- | i18npool/source/collator/collator_unicode.cxx | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx index 275b8f8faf79..3c9e9ee1d6d4 100644 --- a/i18npool/inc/collator_unicode.hxx +++ b/i18npool/inc/collator_unicode.hxx @@ -62,7 +62,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: - const sal_Char *implementationName; std::unique_ptr<icu::RuleBasedCollator> uca_base, collator; #ifndef DISABLE_DYNLOADING oslModule hModule; diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index d3e189a5ff1d..0921aef13f8a 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -36,9 +36,10 @@ using namespace ::com::sun::star::uno; namespace i18npool { +static const char implementationName[] = "com.sun.star.i18n.Collator_Unicode"; + Collator_Unicode::Collator_Unicode() { - implementationName = "com.sun.star.i18n.Collator_Unicode"; collator = nullptr; uca_base = nullptr; #ifndef DISABLE_DYNLOADING @@ -399,7 +400,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: OUString SAL_CALL Collator_Unicode::getImplementationName() { - return OUString::createFromAscii(implementationName); + return OUString(implementationName); } sal_Bool SAL_CALL @@ -411,7 +412,7 @@ Collator_Unicode::supportsService(const OUString& rServiceName) Sequence< OUString > SAL_CALL Collator_Unicode::getSupportedServiceNames() { - Sequence< OUString > aRet { OUString::createFromAscii(implementationName) }; + Sequence< OUString > aRet { OUString(implementationName) }; return aRet; } |