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

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/macrodlg.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c737572cedceeec80ec38db0ad18278bbfdbc64a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Apr 15 16:57:19 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Apr 16 11:13:16 2020 +0200

    tdf#126828 hide macro organize dialog before launching macro editing
    
    so the macro editor isn't forced behind the window with an active dialog
    
    Change-Id: Iae89f6910a8183bcf01872eef71c04bc993f1550
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92307
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit cac8694feab1ccb422294ed3e2f8b682e15835fb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92297
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 97a45c59c03c..0d9ee3691bcb 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -630,6 +630,8 @@ IMPL_LINK(MacroChooser, ButtonHdl, weld::Button&, rButton, void)
             if (m_xMacroBox->get_selected(m_xMacroBoxIter.get()))
                 aInfoItem.SetMethod(m_xMacroBox->get_text(*m_xMacroBoxIter));
             StoreMacroDescription();
+            m_xDialog->hide(); // tdf#126828 dismiss dialog before opening new window
+
             SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
             SfxRequest aRequest( SID_BASICIDE_APPEAR, SfxCallMode::SYNCHRON, aArgs );
             SfxGetpApp()->ExecuteSlot( aRequest );