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-02 12:15:47 +0100 |
| commit | 38fe9fde5cf0dc20272f093989a7797a8ba0e09f (patch) | |
| tree | a29a654ad91bc1fd57190102805b3e2583dc0b4b /desktop/source | |
| parent | 52393273558a68fb8e8e8b7a5da233c5e5c712f1 (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/source')
| -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 deb6cd89ace5..fe1245e1b936 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2237,7 +2237,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); @@ -2253,6 +2253,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; |