diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2018-05-30 09:26:42 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2018-05-31 22:30:46 +0200 |
commit | 0c5dbc94220f6fa0829f61cfaf4ca658868563ce (patch) | |
tree | e533d78561e071e22aea0006d40a58aacd66c6e6 /sc | |
parent | e0edc647d8eb17e69f7a807c7f4cdde7b4190b61 (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/global.cxx | 25 |
1 files changed, 11 insertions, 14 deletions
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); |