[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - 2 commits - loolkitconfig.xcu wsd/DocumentBroker.cpp

[Ashod Nakashian]

 loolkitconfig.xcu      |    3 +++
 wsd/DocumentBroker.cpp |    3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e9ce36f26ea3f007e00efbf9012bbbe8f93ccc9d
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Jan 4 00:16:40 2018 -0500

    wsd: set modified flag on the storage when set on the DocumentBroker
    
    Reviewed-on: https://gerrit.libreoffice.org/47367
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 752e3b7002f2199438aa81d5b660088da3faac44)
    
    Change-Id: I13e25b2edff33d6fd9999dec5eb34d7847fbbd2e
    Reviewed-on: https://gerrit.libreoffice.org/47400
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index fad24344..f149f36c 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -416,7 +416,6 @@ bool DocumentBroker::load(const std::shared_ptr<ClientSession>& session, const s
             LOG_ERR("Failed to create Storage instance for [" << _docKey << "] in " << jailPath.toString());
             return false;
         }
-
         firstInstance = true;
     }
 
@@ -926,7 +925,6 @@ bool DocumentBroker::sendUnoSave(const std::string& sessionId, bool dontTerminat
         oss << "}";
 
         assert(_storage);
-        _storage->setUserModified(_isModified);
         _storage->setIsAutosave(isAutosave || UnitWSD::get().isAutosave());
 
         const auto saveArgs = oss.str();
@@ -1409,6 +1407,7 @@ void DocumentBroker::setModified(const bool value)
         Admin::instance().modificationAlert(_docKey, getPid(), value);
     }
 
+    _storage->setUserModified(value);
     _tileCache->setUnsavedChanges(value);
 }
 
commit 9594408e37ac98f7fb18931a5e53aa1671efd510
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Jan 3 16:34:10 2018 +0530

    lookitconfig.xcu: Set a work path which is valid in chroot
    
    Since the variables are set outside of chroot, workdir directory is
    wrongly picked up as /home/username/Documents or something else. But it
    is not guarranteed that this directory would exist in the chroot. Any
    attempt to access such an invalid directory, eg. during filepicker
    button in hyperlink dialog, freezes the dialog.
    
    Change-Id: I83bfc5787a4f3bd66d8abd30b6204cb1e74e5287
    (cherry picked from commit 831c79c0acbca6a7053080061b14381640c4abb7)
    Reviewed-on: https://gerrit.libreoffice.org/47304
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loolkitconfig.xcu b/loolkitconfig.xcu
index 712311ac..4704e882 100644
--- a/loolkitconfig.xcu
+++ b/loolkitconfig.xcu
@@ -7,4 +7,7 @@
 <!-- Enable spell-checking by default -->
 <item oor:path="/org.openoffice.Office.Linguistic/SpellChecking"><prop oor:name="IsSpellAuto" oor:op="fuse"><value>true</value></prop></item>
 
+<!-- Set a work path which is valid in chroot -->
+<item oor:path="/org.openoffice.Office.Paths/Variables"><prop oor:name="Work" oor:op="fuse"><value>file:///home</value></prop></item>
+
 </oor:items>