diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-03-21 14:18:35 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-03-21 14:27:39 +0100 |
| commit | 3526a576cd74ae33e6cc0722c91a5178f8886caf (patch) | |
| tree | a6896c73ed02c8a4487643c85995f0ad447404c4 | |
| parent | 17ec84cdc14dc66c227fd48dd8786830a1a933cd (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/69507
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
| -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 d79d086b66f9..ee34831af726 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -4442,9 +4442,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()); @@ -4484,6 +4481,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) |