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

[Michael Meeks]

 sfx2/source/doc/docfile.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit f07c91ec42580630eababecfe0513e032871a1aa
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Mar 17 12:11:29 2017 +0000

    tdf#106488 - workaround to disable un-necessary locking for the kit.
    
    Not ideal, not suitable for Android etc. Better fix in online/master.
    
    Change-Id: I49299cdae19fa91c294196e6d82582aaf376fab7
    Reviewed-on: https://gerrit.libreoffice.org/35338
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a0ff22072e5b..82c67a94e7b8 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -89,6 +89,7 @@
 
 #include <osl/file.hxx>
 
+#include <comphelper/lok.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <comphelper/docpasswordhelper.hxx>
@@ -159,6 +160,10 @@ bool IsOOoLockFileUsed()
 
 bool IsLockingUsed()
 {
+    // Hack: don't lock files - and do reverse lookups for online
+    // fixed properly on master/online by overlaying a custom config.
+    if (comphelper::LibreOfficeKit::isActive())
+        return false;
     return officecfg::Office::Common::Misc::UseLocking::get();
 }