sc/source/ui/dbgui/validate.cxx | 8 ++++++++ sc/source/ui/inc/validate.hxx | 2 ++ 2 files changed, 10 insertions(+)
New commits: commit d443eba9e3759454d94faaf8ef8fd3a618f7af8c Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Tue Nov 3 14:04:37 2020 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Tue Nov 3 18:16:47 2020 +0100 Resolves: tdf#137215 restore original modality before dialog loop ends Change-Id: I83467e28534b781c51b8d75a023e41f3c6a03903 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105251 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index c005f24375a7..ec00b9339a07 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -106,6 +106,14 @@ ScValidationDlg::ScValidationDlg(weld::Window* pParent, const SfxItemSet* pArgSe } } +void ScValidationDlg::EndDialog() +{ + // tdf#137215 ensure original modalality of true is restored before dialog loop ends + if (m_bOwnRefHdlr) + RemoveRefDlg(true); + ScValidationDlgBase::EndDialog(); +} + ScValidationDlg::~ScValidationDlg() { if (m_bOwnRefHdlr) diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index bb746f522630..3f64e1485f73 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -176,6 +176,8 @@ public: void SetModal(bool bModal) { m_xDialog->set_modal(bModal); } + virtual void EndDialog() override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override { if ( m_pHandler && m_pSetReferenceHdl ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits