diff options
Diffstat (limited to 'i18nlangtag/source/languagetag/languagetag.cxx')
-rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 850e404e363c..a5a5dea7d0af 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -51,7 +51,6 @@ struct myLtError // "statics" to be returned as const reference to an empty locale and string. struct theEmptyLocale : public rtl::Static< lang::Locale, theEmptyLocale > {}; -struct theEmptyBcp47 : public rtl::Static< OUString, theEmptyBcp47 > {}; } typedef std::unordered_set< OUString > KnownTagSet; @@ -1561,8 +1560,10 @@ const OUString & LanguageTagImpl::getBcp47() const const OUString & LanguageTag::getBcp47( bool bResolveSystem ) const { + static const OUString theEmptyBcp47 = u""; + if (!bResolveSystem && mbSystemLocale) - return theEmptyBcp47::get(); + return theEmptyBcp47; if (!mbInitializedBcp47) syncVarsFromImpl(); if (!mbInitializedBcp47) |