[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-4' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/formdlg/formula.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1b4c9908887b5260033b431d6c5e4a9c10b9ee53
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 21 20:43:11 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Dec 1 21:23:41 2019 +0100

    tdf#124513 let wizard reappear on tabbing back to document
    
    where it was showing before tabbing away
    
    Change-Id: Ia87aeb9789ae034611431983c6489569a59d47d3
    Reviewed-on: https://gerrit.libreoffice.org/83434
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit f31d36966bceb90e261cbecd42634bde4448d527)
    Reviewed-on: https://gerrit.libreoffice.org/83781
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit 95846782231096345e9a09b3fa35355316ef50fe)
    Reviewed-on: https://gerrit.libreoffice.org/83973
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 3c412a95aa16..08ad10c5b36c 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -287,6 +287,9 @@ ScInputHandler* ScFormulaDlg::GetNextInputHandler(const ScDocShell* pDocShell, S
 
 void ScFormulaDlg::Close()
 {
+    if (IsClosing())
+        return;
+
     DoEnter();
 }