diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-10-29 12:54:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-10-30 11:07:29 +0200 |
| commit | d33703e26a926507637733612ef169b3f3e05002 (patch) | |
| tree | 28f4938304e49d5a71db301d7bff2183815f647a | |
| parent | 1295f497e0cc7fc7cfcb66182496a4d29aa701b3 (diff) | |
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/+/124430
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 9 | ||||
| -rw-r--r-- | cui/source/inc/scriptdlg.hxx | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 3ba92fc337cf..4ae05a0c48e6 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(); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 3f16d8a66bab..d2e5cae7f27d 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; |