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>
This commit is contained in:
Jan Holesovsky
2019-03-21 14:18:35 +01:00
parent fbd79c6125
commit cc4228b028

View File

@@ -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)