[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sc/source sw/source

[Noel Grandin (via logerrit)]

 desktop/source/lib/init.cxx       |    4 ++--
 sc/source/core/tool/chgtrack.cxx  |    4 ++--
 sw/source/uibase/uno/unotxdoc.cxx |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2054b11539d2c2e67930c1ee32326ebe20f25c3e
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Wed Jan 6 12:59:29 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jan 19 09:30:20 2021 +0100

    fix location of change tracking boxes in Online
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108849
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 042bb632978a1d01f3240890ea9d39ead707633d)
    
    Change-Id: I65fcb52e224dce7df2a5a7baed2b8f23d0d49397
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108861
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 35ea08209e7e..cad798a9be44 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4852,12 +4852,12 @@ static char* getTrackedChanges(LibreOfficeKitDocument* pThis)
     // construct the tracked changes JSON from inside the sw/, not here using UNO
     if (doc_getDocumentType(pThis) != LOK_DOCTYPE_TEXT && xRedlinesSupplier.is())
     {
-        auto redlinesNode = aJson.startNode("redlines");
+        auto redlinesNode = aJson.startArray("redlines");
         uno::Reference<container::XEnumeration> xRedlines = xRedlinesSupplier->getRedlines()->createEnumeration();
         for (size_t nIndex = 0; xRedlines->hasMoreElements(); ++nIndex)
         {
             uno::Reference<beans::XPropertySet> xRedline(xRedlines->nextElement(), uno::UNO_QUERY);
-            auto redlineNode = aJson.startNode("");
+            auto redlineNode = aJson.startStruct();
             aJson.put("index", nIndex);
 
             OUString sAuthor;
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 3deab497102c..778cd5d57d2b 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -4670,7 +4670,7 @@ static void lcl_getTrackedChange(ScDocument* pDoc, int nIndex, const ScChangeAct
 {
     if (pAction->GetType() == SC_CAT_CONTENT)
     {
-        auto redlinesNode = rRedlines.startNode("");
+        auto redlinesNode = rRedlines.startStruct();
         rRedlines.put("index", nIndex);
 
         rRedlines.put("author", pAction->GetUser());
@@ -4690,7 +4690,7 @@ static void lcl_getTrackedChange(ScDocument* pDoc, int nIndex, const ScChangeAct
 
 void ScChangeTrack::GetChangeTrackInfo(tools::JsonWriter& aRedlines)
 {
-    auto redlinesNode = aRedlines.startNode("redlines");
+    auto redlinesNode = aRedlines.startArray("redlines");
 
     ScChangeAction* pAction = GetFirst();
     if (pAction)
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 9a0ebcafcc1e..42d872352e92 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3280,7 +3280,7 @@ PointerStyle SwXTextDocument::getPointer()
 
 void SwXTextDocument::getTrackedChanges(tools::JsonWriter& rJson)
 {
-    auto redlinesNode = rJson.startNode("redlines");
+    auto redlinesNode = rJson.startArray("redlines");
 
     // Disable since usability is very low beyond some small number of changes.
     static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
@@ -3290,7 +3290,7 @@ void SwXTextDocument::getTrackedChanges(tools::JsonWriter& rJson)
             = pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
         for (SwRedlineTable::size_type i = 0; i < rRedlineTable.size(); ++i)
         {
-            auto redlineNode = rJson.startNode("");
+            auto redlineNode = rJson.startStruct();
             rJson.put("index", rRedlineTable[i]->GetId());
             rJson.put("author", rRedlineTable[i]->GetAuthorString(1));
             rJson.put("type", SwRedlineTypeToOUString(