summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-02-11 18:26:24 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-02-11 18:27:06 +0100
commit763521335b01a37c511ae8069cade9b4b69fef66 (patch)
tree74bb7481c5f7b230a2f86436acdc923d3f18116e
parent8973bc02fd9b7f72db9c942e0fbd3a8b156cb53b (diff)
tdf#56544: Support LO's .~lock.*# file locking over smb, too
Change-Id: Ia18c3044aba82f935b13f22ba98aff42e9d5098f
-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 fbff6954e5c8..705d44244f83 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -926,11 +926,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;
}
}