Blame SOURCES/0008-Resolves-tdf-137215-restore-original-modality-before.patch

9317df
From fa0371ce0456bfe355c36df0741ff23daeccb3a3 Mon Sep 17 00:00:00 2001
9317df
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
9317df
Date: Tue, 3 Nov 2020 14:04:37 +0000
9317df
Subject: [PATCH 8/8] Resolves: tdf#137215 restore original modality before
9317df
 dialog loop ends
9317df
9317df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105214
9317df
Tested-by: Jenkins
9317df
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
9317df
(cherry picked from commit 022c11602d2101b49724b5cf104cc6c70b5a5e4b)
9317df
9317df
Change-Id: I83467e28534b781c51b8d75a023e41f3c6a03903
9317df
---
9317df
 sc/source/ui/dbgui/validate.cxx | 8 ++++++++
9317df
 sc/source/ui/inc/validate.hxx   | 2 ++
9317df
 2 files changed, 10 insertions(+)
9317df
9317df
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
9317df
index 41bc913db911..73e04cc44706 100644
9317df
--- a/sc/source/ui/dbgui/validate.cxx
9317df
+++ b/sc/source/ui/dbgui/validate.cxx
9317df
@@ -95,6 +95,14 @@ ScValidationDlg::ScValidationDlg(weld::Window* pParent, const SfxItemSet* pArgSe
9317df
     AddTabPage("erroralert", ScTPValidationError::Create, nullptr);
9317df
 }
9317df
 
9317df
+void ScValidationDlg::EndDialog()
9317df
+{
9317df
+    // tdf#137215 ensure original modalality of true is restored before dialog loop ends
9317df
+    if (m_bOwnRefHdlr)
9317df
+        RemoveRefDlg(true);
9317df
+    ScValidationDlgBase::EndDialog();
9317df
+}
9317df
+
9317df
 ScValidationDlg::~ScValidationDlg()
9317df
 {
9317df
     if (m_bOwnRefHdlr)
9317df
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
9317df
index 2c562717f921..cb88b9e8b40e 100644
9317df
--- a/sc/source/ui/inc/validate.hxx
9317df
+++ b/sc/source/ui/inc/validate.hxx
9317df
@@ -176,6 +176,8 @@ public:
9317df
 
9317df
     void            SetModal(bool bModal) { m_xDialog->set_modal(bModal); }
9317df
 
9317df
+    virtual void EndDialog() override;
9317df
+
9317df
     virtual void            SetReference( const ScRange& rRef, ScDocument* pDoc ) override
9317df
     {
9317df
         if ( m_pHandler && m_pSetReferenceHdl )
9317df
-- 
9317df
2.28.0
9317df