[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/source

[Michael Meeks]

 desktop/source/lib/init.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 38fe9fde5cf0dc20272f093989a7797a8ba0e09f
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Jul 29 17:19:47 2016 +0100

    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 at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index deb6cd8..fe1245e 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;