diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-11-03 14:04:37 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-11-29 12:08:08 +0100 |
| commit | 7ee6bb22e9874b4be5a2124e27de886c8bf45b30 (patch) | |
| tree | ef2cb5781e7fc1b8cde9bf91e08da02010234909 | |
| parent | 455cd8fe00d1c756da1bb50a50bac68a1ad645ef (diff) | |
Resolves: tdf#137215 restore original modality before dialog loop ends
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105214
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 022c11602d2101b49724b5cf104cc6c70b5a5e4b)
Change-Id: I83467e28534b781c51b8d75a023e41f3c6a03903
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106831
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | sc/source/ui/dbgui/validate.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/inc/validate.hxx | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index e2c960d1820f..3482930f173d 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 2c562717f921..cb88b9e8b40e 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* pDoc ) override { if ( m_pHandler && m_pSetReferenceHdl ) |