vcl/jsdialog/jsdialogbuilder.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit dd5a1d31adbd43e81f7165c913ce474df74a85b7
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Dec 2 15:06:35 2020 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Dec 7 13:57:58 2020 +0100
jsdialog: use valid window instance
Change-Id: I3b7e98de41f56abbab1d8c15b7928089ebf8159a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107077
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107339
Tested-by: Jenkins
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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
