diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-11 18:26:24 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-02-11 20:34:09 +0000 |
| commit | 7f93dba17d397c5bf265504e8fbecd6b615e1787 (patch) | |
| tree | 9255990a374b266c74deaff20629b7ef7ed53123 | |
| parent | 08004a12fa0d7f08cff53b5cf6b6c2409bd47754 (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/22298
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index d89235a8a70e..fcb7f849fa71 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -925,11 +925,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; } } |