sfx2/source/doc/docfile.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 6c5af47fc25aecc624e68af174c7e1d9ca2392f9 Author: Juergen Funk <[email protected]> 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 <[email protected]> Tested-by: Katarina Behrens <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/49469 Reviewed-by: Aron Budea <[email protected]> Tested-by: Aron Budea <[email protected]> diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 431f9d2e78dc..98c861358090 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1242,7 +1242,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&) @@ -1250,7 +1251,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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
