Kaydet (Commit) 0c5dbc94 authored tarafından Luboš Luňák's avatar Luboš Luňák Kaydeden (comit) Michael Meeks

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/55046Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst e0edc647
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment