sfx2/source/doc/docfile.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit af9bea21390800e5bbc73e07ce9828189d8dabf3 Author: Juergen Funk <juergen.funk...@cib.de> Date: Wed Jun 21 14:41:49 2017 +0200 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.behr...@cib.de> Tested-by: Katarina Behrens <katarina.behr...@cib.de> 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 } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits