sc/source/core/data/global.cxx | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)
New commits: commit 0c5dbc94220f6fa0829f61cfaf4ca658868563ce Author: Luboš Luňák <l.lu...@collabora.com> Date: Wed May 30 09:26:42 2018 +0200 move related functions next to each other And remove a pointless assert (the object is now created on demand). Change-Id: Ib42164b57216499e53ebc4ed5d1bc270055db2e7 Reviewed-on: https://gerrit.libreoffice.org/55046 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Meeks <michael.me...@collabora.com> diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 0ac839200cb3..6e258407653d 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -1016,11 +1016,19 @@ utl::TransliterationWrapper* ScGlobal::GetpTransliteration() ::comphelper::getProcessComponentContext(), TransliterationFlags::IGNORE_CASE ); pTransliteration->loadModuleIfNeeded( eOfficeLanguage ); } - OSL_ENSURE( - pTransliteration, - "ScGlobal::GetpTransliteration() called before ScGlobal::Init()"); return pTransliteration; } +::utl::TransliterationWrapper* ScGlobal::GetCaseTransliteration() +{ + assert(!bThreadedGroupCalcInProgress); + if ( !pCaseTransliteration ) + { + const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguageTag().getLanguageType(); + pCaseTransliteration = new ::utl::TransliterationWrapper(::comphelper::getProcessComponentContext(), TransliterationFlags::NONE ); + pCaseTransliteration->loadModuleIfNeeded( eOfficeLanguage ); + } + return pCaseTransliteration; +} const LocaleDataWrapper* ScGlobal::GetpLocaleData() { @@ -1059,17 +1067,6 @@ CollatorWrapper* ScGlobal::GetCaseCollator() return p; }); } -::utl::TransliterationWrapper* ScGlobal::GetCaseTransliteration() -{ - assert(!bThreadedGroupCalcInProgress); - if ( !pCaseTransliteration ) - { - const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguageTag().getLanguageType(); - pCaseTransliteration = new ::utl::TransliterationWrapper(::comphelper::getProcessComponentContext(), TransliterationFlags::NONE ); - pCaseTransliteration->loadModuleIfNeeded( eOfficeLanguage ); - } - return pCaseTransliteration; -} css::lang::Locale* ScGlobal::GetLocale() { assert(!bThreadedGroupCalcInProgress); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits