summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-02-11 18:26:24 +0100
committerMichael Stahl <mstahl@redhat.com>2016-02-15 20:01:40 +0000
commitaf252f871d398f395542103428c5d4d3d81965cd (patch)
tree530f8e7227775851eaeb92b409dc619a92dbead8
parentb7bf29eb0896eb2f431345e1a0c3515a3a13ecc6 (diff)
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@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sfx2/source/doc/docfile.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a9a5df0633e7..e30deb7ee84e 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;
}
}