diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-12-02 15:06:35 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-12-07 13:57:58 +0100 |
| commit | dd5a1d31adbd43e81f7165c913ce474df74a85b7 (patch) | |
| tree | b677e1ca841f8a080850bb68802e1fea0e31c9fe /vcl | |
| parent | 1a6191621a0257c479bdfe24e125c0258d4b3d0d (diff) | |
jsdialog: use valid window instance
Change-Id: I3b7e98de41f56abbab1d8c15b7928089ebf8159a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107077
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107339
Tested-by: Jenkins
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/jsdialog/jsdialogbuilder.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 051c90c7b6db..3c663bac10e0 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -363,12 +363,6 @@ std::unique_ptr<weld::Dialog> JSInstanceBuilder::weld_dialog(const OString& id) InsertWindowToMap(m_nWindowId); - std::unique_ptr<weld::Dialog> pRet(pDialog ? new JSDialog(m_aOwnedToplevel, m_aOwnedToplevel, - pDialog, this, false, m_sTypeOfJSON) - : nullptr); - - RememberWidget("__DIALOG__", pRet.get()); - if (pDialog) { assert(!m_aOwnedToplevel && "only one toplevel per .ui allowed"); @@ -377,6 +371,12 @@ std::unique_ptr<weld::Dialog> JSInstanceBuilder::weld_dialog(const OString& id) m_bHasTopLevelDialog = true; } + std::unique_ptr<weld::Dialog> pRet(pDialog ? new JSDialog(m_aOwnedToplevel, m_aOwnedToplevel, + pDialog, this, false, m_sTypeOfJSON) + : nullptr); + + RememberWidget("__DIALOG__", pRet.get()); + const vcl::ILibreOfficeKitNotifier* pNotifier = pDialog->GetLOKNotifier(); if (pNotifier) { |