diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-07-29 17:19:47 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-08-01 17:08:33 +0000 |
| commit | af2eed716fbf5e78a5f41d7055b69d74643850ed (patch) | |
| tree | b5c58ec075c987c7b87f4c637cd5b9817109b8be /desktop | |
| parent | 4cbaa49c0ee707a2e1e1d842279b32473e8c8a28 (diff) | |
lok: re-load UNO bootstrap pieces and set UserInstallation on second init.
Ideally should check whether the path is different. Changing the user-install
path is useful for valgrinding online outside of a chroot jail.
Change-Id: I6ad76af1245491acdcb6664896be89073406b742
Reviewed-on: https://gerrit.libreoffice.org/27782
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 9e15484cf0d4..5972424ee4ba 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2220,7 +2220,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char if (eStage != PRE_INIT) comphelper::LibreOfficeKit::setStatusIndicatorCallback(lo_status_indicator_callback, pLib); - if (eStage != SECOND_INIT && pUserProfileUrl) + if (pUserProfileUrl) { OUString url( pUserProfileUrl, strlen(pUserProfileUrl), RTL_TEXTENCODING_UTF8); @@ -2236,6 +2236,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char SAL_WARN("lok", "resolving <" << url << "> failed with " << +e); } rtl::Bootstrap::set("UserInstallation", url); + if (eStage == SECOND_INIT) + utl::Bootstrap::reloadData(); } OUString aAppPath; |