diff options
| author | Eike Rathke <erack@redhat.com> | 2017-10-27 14:48:26 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-10-27 18:29:43 +0200 |
| commit | 51a7ae749de90485f3b15a3f935f0f11d5aeff5b (patch) | |
| tree | 2c188f081e6c72dc250861a70d94a82acfcd31dd /unotools | |
| parent | 2c1ab132685bee9251901be38e113e129c2c3fce (diff) | |
Let LocaleDataWrapper::getLocaleItem() return LocaleDataItem2&, tdf#81671
Change-Id: I16cfe81dd3ce0c8c2e905d55bea13df134c7a398
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/i18n/localedatawrapper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 77940997ace6..d2552ffe4a82 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -173,7 +173,7 @@ css::i18n::LanguageCountryInfo LocaleDataWrapper::getLanguageCountryInfo() const return css::i18n::LanguageCountryInfo(); } -const css::i18n::LocaleDataItem& LocaleDataWrapper::getLocaleItem() const +const css::i18n::LocaleDataItem2& LocaleDataWrapper::getLocaleItem() const { { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -188,7 +188,7 @@ const css::i18n::LocaleDataItem& LocaleDataWrapper::getLocaleItem() const ::utl::ReadWriteGuard aGuard( aMutex ); const css::lang::Locale& rLocal = getMyLocale(); - css::i18n::LocaleDataItem aItem = xLD->getLocaleItem( rLocal ); + css::i18n::LocaleDataItem2 aItem = xLD->getLocaleItem2( rLocal ); auto aRet = maDataItemCache.insert(std::make_pair(rLocal, aItem)); assert(aRet.second); return aRet.first->second; @@ -197,7 +197,7 @@ const css::i18n::LocaleDataItem& LocaleDataWrapper::getLocaleItem() const { SAL_WARN( "unotools.i18n", "getLocaleItem: Exception caught " << e ); } - static css::i18n::LocaleDataItem aEmptyItem; + static css::i18n::LocaleDataItem2 aEmptyItem; return aEmptyItem; } |