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

[Henry Castro (via logerrit)]

 sfx2/source/sidebar/Deck.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4fde580fc3d30723220a90853eea5c564bc825a5
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue Dec 8 09:06:45 2020 -0400
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Apr 29 09:53:02 2021 +0200

    lok: fix "children" node type
    
    In order to build the dialog on the client side,
    the "children" object should be constructed with array type.
    
    Change-Id: Iccde39aa9ff2f423fd4a67072ca0bf25e406d220
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107413
    Tested-by: Jenkins
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114802
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 9c0c37041f58..e20ef9be1794 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -200,7 +200,7 @@ void Deck::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
     rJsonWriter.put("text", GetText());
     rJsonWriter.put("enabled", IsEnabled());
 
-    auto childrenNode = rJsonWriter.startNode("children");
+    auto childrenNode = rJsonWriter.startArray("children");
     for (auto &it : maPanels)
     {
         if (it->IsLurking())
@@ -214,13 +214,13 @@ void Deck::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
         if (!pWindow)
             continue;
 
-        auto childNode = rJsonWriter.startNode("");
+        auto childNode = rJsonWriter.startStruct();
         rJsonWriter.put("id", it->GetId());
         rJsonWriter.put("type", "panel");
         rJsonWriter.put("text", it->GetText());
         rJsonWriter.put("enabled", it->IsEnabled());
 
-        auto children2Node = rJsonWriter.startNode("children");
+        auto children2Node = rJsonWriter.startArray("children");
         pWindow->DumpAsPropertyTree(rJsonWriter);
     }
 }