commit 68e3ed223eec7ccfe1a0a1f0cd8e09b88ca9e313
author Caolán McNamara <caolanm@redhat.com> Fri Oct 29 12:54:26 2021 +0100
committer Michael Stahl <michael.stahl@allotropia.de> Mon Nov 01 12:10:00 2021 +0100
tree 406f76c8c60b5c0fc18cf42053634fa654da1829
parent e98083f2845238ed04c14f9a8e6da8e5db56727b

Resolves: tdf#145377 don't use dismissed dialog as parent for error dialogs

the script dialog is dismissed before the error dialogs get executed

Change-Id: I9e143a7e65077d09f436c4744759c78a9970f1d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124467
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

cui/source/dialogs/scriptdlg.cxx

diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 1258ee5..b000b4b 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -372,6 +372,7 @@ CuiInputDialog::CuiInputDialog(weld::Window * pParent, InputDialogMode nMode)

SvxScriptOrgDialog::SvxScriptOrgDialog(weld::Window* pParent, const OUString& language)
    : SfxDialogController(pParent, "cui/ui/scriptorganizer.ui", "ScriptOrganizerDialog")
    , m_pParent(pParent)
    , m_sLanguage(language)
    , m_delErrStr(CuiResId(RID_SVXSTR_DELFAILED))
    , m_delErrTitleStr(CuiResId(RID_SVXSTR_DELFAILED_TITLE))
@@ -622,19 +623,19 @@ IMPL_LINK(SvxScriptOrgDialog, ButtonHdl, weld::Button&, rButton, void)
            }
            catch ( reflection::InvocationTargetException& ite )
            {
                SvxScriptErrorDialog::ShowAsyncErrorDialog(getDialog(), css::uno::Any(ite));
                SvxScriptErrorDialog::ShowAsyncErrorDialog(m_pParent, css::uno::Any(ite));
            }
            catch ( provider::ScriptFrameworkErrorException& ite )
            {
                SvxScriptErrorDialog::ShowAsyncErrorDialog(getDialog(), css::uno::Any(ite));
                SvxScriptErrorDialog::ShowAsyncErrorDialog(m_pParent, css::uno::Any(ite));
            }
            catch ( RuntimeException& re )
            {
                SvxScriptErrorDialog::ShowAsyncErrorDialog(getDialog(), css::uno::Any(re));
                SvxScriptErrorDialog::ShowAsyncErrorDialog(m_pParent, css::uno::Any(re));
            }
            catch ( Exception& e )
            {
                SvxScriptErrorDialog::ShowAsyncErrorDialog(getDialog(), css::uno::Any(e));
                SvxScriptErrorDialog::ShowAsyncErrorDialog(m_pParent, css::uno::Any(e));
            }
        }
        StoreCurrentSelection();

cui/source/inc/scriptdlg.hxx

diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 6a1cbd1..954f3d9 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -77,6 +77,7 @@ public:
class SvxScriptOrgDialog : public SfxDialogController
{
protected:
    weld::Window* m_pParent;
    OUString         m_sLanguage;
    static Selection_hash   m_lastSelection;
    const OUString m_delErrStr;