diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2018-06-26 11:48:42 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2018-07-04 16:52:09 +0200 |
| commit | 6b5d49e129ba1f480ff74b4db657bd0e0dcd2bdf (patch) | |
| tree | 61d7e93dbcf6bb83e6e0f55432e4431eb9f3cfab /include | |
| parent | e62d2e5ebc94a64767c4c5e6f1f7529cada72fe4 (diff) | |
fix thread-unsafe return of a reference to a static
The Mapping struct is small, so there's no need to reuse it.
Without this, sc/qa/.../sumif_wildcards.fods sometimes fails with calc
threading.
Change-Id: If1f370bebe8e1afa14f8645d843a056b6f0dbdea
Reviewed-on: https://gerrit.libreoffice.org/56449
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit 87ac4627260bc56825f1283a3a4d88b7f5e466d8)
Reviewed-on: https://gerrit.libreoffice.org/56514
Diffstat (limited to 'include')
| -rw-r--r-- | include/i18nutil/casefolding.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/i18nutil/casefolding.hxx b/include/i18nutil/casefolding.hxx index 5ed59c57cd36..ca29cabb4959 100644 --- a/include/i18nutil/casefolding.hxx +++ b/include/i18nutil/casefolding.hxx @@ -74,9 +74,9 @@ class I18NUTIL_DLLPUBLIC casefolding { public: /// @throws css::uno::RuntimeException - static Mapping& getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, css::lang::Locale const & aLocale, MappingType nMappingType); + static Mapping getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, css::lang::Locale const & aLocale, MappingType nMappingType); /// @throws css::uno::RuntimeException - static Mapping& getConditionalValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, css::lang::Locale const & aLocale, MappingType nMappingType); + static const Mapping& getConditionalValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, css::lang::Locale const & aLocale, MappingType nMappingType); /// @throws css::uno::RuntimeException static sal_Unicode getNextChar(const sal_Unicode *str, sal_Int32& idx, sal_Int32 len, MappingElement& e, css::lang::Locale const & aLocale, MappingType nMappingtype, TransliterationFlags moduleLoaded); |