diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-03-21 14:18:35 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-03-22 14:40:17 +0100 |
| commit | cc4228b028d969a9bb49a5d2451eaa88aa400eae (patch) | |
| tree | 3d8bd130e1ad40cd9fb1757ce5ebe30ee3cad440 /desktop | |
| parent | fbd79c6125fd302dde9af2d76171dd5ca794af4d (diff) | |
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/69508
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 84d9b4b59976..a83af85d4441 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -4392,9 +4392,6 @@ static void preloadData() } 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; xGlobalCfg = css::ui::GlobalAcceleratorConfiguration::create( comphelper::getProcessComponentContext()); @@ -4434,6 +4431,9 @@ static void preloadData() nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale, false), COMPLEX); 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) |