Kaydet (Commit) 3526a576 authored tarafından Jan Holesovsky's avatar Jan Holesovsky Kaydeden (comit) Andras Timar

lok: Keep the temporary user profile set during the entire preload.

Otherwise the core likes to crash due to the keyboard accellerators
being read, but the configuration is missing.

Change-Id: I94193f47462227b5975a49ce11709d7bf415a519
Reviewed-on: https://gerrit.libreoffice.org/69507Reviewed-by: 's avatarAndras Timar <andras.timar@collabora.com>
Tested-by: 's avatarAndras Timar <andras.timar@collabora.com>
üst 17ec84cd
...@@ -4442,9 +4442,6 @@ static void preloadData() ...@@ -4442,9 +4442,6 @@ static void preloadData()
} }
std::cerr << "\n"; std::cerr << "\n";
// Set user profile's path back to the original one
rtl::Bootstrap::set("UserInstallation", sUserPath);
css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg;
xGlobalCfg = css::ui::GlobalAcceleratorConfiguration::create( xGlobalCfg = css::ui::GlobalAcceleratorConfiguration::create(
comphelper::getProcessComponentContext()); comphelper::getProcessComponentContext());
...@@ -4484,6 +4481,9 @@ static void preloadData() ...@@ -4484,6 +4481,9 @@ static void preloadData()
nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale, false), COMPLEX); nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale, false), COMPLEX);
OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne); OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne);
} }
// Set user profile's path back to the original one
rtl::Bootstrap::set("UserInstallation", sUserPath);
} }
static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char* pUserProfileUrl) static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char* pUserProfileUrl)
......
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