[Libreoffice-commits] core.git: sfx2/source
Stephan Bergmann
sbergman at redhat.com
Thu Feb 11 17:27:38 UTC 2016
sfx2/source/doc/docfile.cxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 763521335b01a37c511ae8069cade9b4b69fef66
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
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index fbff695..705d442 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;
}
}
More information about the Libreoffice-commits
mailing list