[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/jsdialog

[Szymon KÅ‚os (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit b971352b475cdc1e97300a2c052859d1a2742668
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jun 29 12:34:18 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Jun 29 15:05:42 2021 +0200

    jsdialog: use original container type for popups
    
    Change-Id: I6cffa33d7bfbc9087b8fff08b993c2a87b8811c2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118080
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 610f24045a33..6251b892697e 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -226,7 +226,13 @@ JSDialogNotifyIdle::generatePopupMessage(VclPtr<vcl::Window> pWindow, OUString s
     if (!pWindow->GetParentWithLOKNotifier())
         return aJsonWriter;
 
-    pWindow->DumpAsPropertyTree(*aJsonWriter);
+    {
+        auto aChildren = aJsonWriter->startArray("children");
+        {
+            auto aStruct = aJsonWriter->startStruct();
+            pWindow->DumpAsPropertyTree(*aJsonWriter);
+        }
+    }
 
     aJsonWriter->put("jsontype", "dialog");
     aJsonWriter->put("type", "modalpopup");