[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-1' - sfx2/source

[Stephan Bergmann]

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

New commits:
commit af252f871d398f395542103428c5d4d3d81965cd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 11 18:26:24 2016 +0100

    tdf#56544: Support LO's .~lock.*# file locking over smb, too
    
    Change-Id: Ia18c3044aba82f935b13f22ba98aff42e9d5098f
    (cherry picked from commit 763521335b01a37c511ae8069cade9b4b69fef66)
    Reviewed-on: https://gerrit.libreoffice.org/22296
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a9a5df0..e30deb7 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -928,11 +928,12 @@ namespace
     {
         INetURLObject aUrl( rLogicName );
         INetProtocol eProt = aUrl.GetProtocol();
-#if HAVE_FEATURE_MACOSX_SANDBOX
-        return eProt == INetProtocol::Sftp;
-#else
-        return eProt == INetProtocol::File || eProt == INetProtocol::Sftp;
+#if !HAVE_FEATURE_MACOSX_SANDBOX
+        if (eProt == INetProtocol::File) {
+            return true;
+        }
 #endif
+        return eProt == INetProtocol::Smb || eProt == INetProtocol::Sftp;
     }
 }