diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-04 10:00:51 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-04 11:31:21 +0100 |
| commit | 607b80ca3cddc239a35580470944a438ce144fc8 (patch) | |
| tree | 169a9d9644696431bb965cac00977c8b15b66c68 /include/sfx2/docfile.hxx | |
| parent | 5726f563550a14f761bba7fbd813dc67ee230caa (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>
Diffstat (limited to 'include/sfx2/docfile.hxx')
| -rw-r--r-- | include/sfx2/docfile.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 7022d51743d9..2f7d9454c1e5 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -295,7 +295,8 @@ public: private: enum class ShowLockResult { NoLock, Succeeded, Try }; - ShowLockResult ShowLockedDocumentDialog(const LockFileEntry& aData, bool bIsLoading, bool bOwnLock, bool bHandleSysLocked); + ShowLockResult ShowLockedDocumentDialog(const OUString& aDocURL, const LockFileEntry& aData, + bool bIsLoading, bool bOwnLock, bool bHandleSysLocked); enum class MessageDlg { LockFileIgnore, LockFileCorrupt }; bool ShowLockFileProblemDialog(MessageDlg nWhichDlg); |