diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-04 10:00:51 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-12-29 20:14:46 +0100 |
| commit | 6365cb0e5e1316bf0b27d22952ec63d72ef7bf5b (patch) | |
| tree | e284b8f029d88ae8d9693d3b7225470056f37587 /sal/osl | |
| parent | fb4dd9667551a0ee162584e1cf1c10fd3451ea0b (diff) | |
tdf#34171: check foreign lockfiles to tell who has locked document
MS Office (Word/Excel/PowerPoint) lockfiles are supported now.
Note that Excel does *not* create lockfiles for pre-OOXML files.
This changes osl_openFile implementation on Windows, to treat
osl_File_OpenFlag_NoLock to also include FILE_SHARE_DELETE flag
for CreateFileW. This is required to allow opening files created
with FILE_FLAG_DELETE_ON_CLOSE flag, such as Excel's owner files.
The shange should be consistent with the overall meaning of the
osl_File_OpenFlag_NoLock to not impose any locking constraints
to the file being opened.
Change-Id: I7b99012f4bd60ab3821fb91d5166a286031b7e93
Reviewed-on: https://gerrit.libreoffice.org/64496
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 607b80ca3cddc239a35580470944a438ce144fc8)
Reviewed-on: https://gerrit.libreoffice.org/65085
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/w32/file.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index 7c0b6674c23f..c6265c5b9b2f 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -710,7 +710,7 @@ oslFileError SAL_CALL osl_openFile( dwShare |= FILE_SHARE_WRITE; if (uFlags & osl_File_OpenFlag_NoLock) - dwShare |= FILE_SHARE_WRITE; + dwShare |= FILE_SHARE_WRITE | FILE_SHARE_DELETE; if (uFlags & osl_File_OpenFlag_Create) dwCreation |= CREATE_NEW; |