diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2017-06-21 14:41:49 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-06-22 11:35:07 +0200 |
| commit | af9bea21390800e5bbc73e07ce9828189d8dabf3 (patch) | |
| tree | 93a4c780795828d697dc88d4943553603fa0063f | |
| parent | fc50502af935d6d551fcc74712cf32f2fcdce6a4 (diff) | |
Improve tdf#106942: always erase empty/corrupt lockfile
also when we could not create lockfile, not only when open as readonly
Change-Id: Ied53bbfe47669f62553d97d81f0bed156ae58887
Reviewed-on: https://gerrit.libreoffice.org/39054
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index ae39a016c5cf..e8fbc812e5e9 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1197,7 +1197,8 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI ) if (bLoading && !bNoUI) { bIoErr = true; - bResult = ShowLockFileProblemDialog(MessageDlg::LockFileIgnore); + ShowLockFileProblemDialog(MessageDlg::LockFileIgnore); + bResult = true; // always delete the defect lock-file } } catch (const uno::Exception&) @@ -1205,7 +1206,8 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI ) if (bLoading && !bNoUI) { bIoErr = true; - bResult = ShowLockFileProblemDialog(MessageDlg::LockFileIgnore); + ShowLockFileProblemDialog(MessageDlg::LockFileIgnore); + bResult = true; // always delete the defect lock-file } } |