diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2017-06-21 14:41:49 +0200 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2018-02-09 20:29:45 +0100 |
| commit | 95994da7e162a972b25c69023c42756735cc9d8d (patch) | |
| tree | bb0b9b027349e396246ad34971a6562f6bc19e9e /sfx2 | |
| parent | 748abfdd6104b0023fe545f8ea380f8af4fc892d (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>
Reviewed-on: https://gerrit.libreoffice.org/49469
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
(cherry picked from commit 6c5af47fc25aecc624e68af174c7e1d9ca2392f9)
Diffstat (limited to 'sfx2')
| -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 7e2bbc973443..b1ce8b84655b 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1240,7 +1240,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&) @@ -1248,7 +1249,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 } } |