diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-11 10:23:28 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-11 12:46:01 +0200 |
| commit | 3d236177be255b2027a997bfc12fe0833ca9a2f7 (patch) | |
| tree | d67582e355bccb43cf133c1857f5dd6136be2f35 /i18npool | |
| parent | 6c65c62c26a8aa4d04466545f8f04ec86b797012 (diff) | |
Deduplicate O(U)StringConcatenation
And use an overloaded helper function with a better (?) unified name
to show that the result is not an O(U)String.
Change-Id: I8956338b05d02bf46a6185828130ea8ef145d46b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141203
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/indexentry/indexentrysupplier.cxx | 4 | ||||
| -rw-r--r-- | i18npool/source/localedata/LocaleNode.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index 0b463315e872..8a5bd818e217 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -129,7 +129,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c // Load service with name <base>_<lang>_<country>_<algorithm> // or <base>_<bcp47>_<algorithm> and fallbacks. bLoaded = createLocaleSpecificIndexEntrySupplier( - OUStringConcatenation( + Concat2View( LocaleDataImpl::getFirstLocaleServiceName( rLocale) + "_" + aSortAlgorithm)); if (!bLoaded) @@ -137,7 +137,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c ::std::vector< OUString > aFallbacks( LocaleDataImpl::getFallbackLocaleServiceNames( rLocale)); for (auto const& fallback : aFallbacks) { - bLoaded = createLocaleSpecificIndexEntrySupplier(OUStringConcatenation(fallback + "_" + aSortAlgorithm)); + bLoaded = createLocaleSpecificIndexEntrySupplier(Concat2View(fallback + "_" + aSortAlgorithm)); if (bLoaded) break; } diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index c20edbfb58e9..acc7dd8f927b 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -799,7 +799,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const if (n100s < 0) incErrorInt( "Error: Time100SecSeparator not present in FormatCode formatindex=\"%d\".\n", formatindex); - n100s = aCode.indexOf( OUStringConcatenation(pSep->getValue() + "00")); + n100s = aCode.indexOf( Concat2View(pSep->getValue() + "00")); if (n100s < 0) incErrorInt( "Error: Time100SecSeparator+00 not present in FormatCode formatindex=\"%d\".\n", formatindex); |