diff options
| author | Noel Grandin <noel@peralex.com> | 2021-01-06 12:59:29 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2021-01-15 17:41:15 +0100 |
| commit | 042bb632978a1d01f3240890ea9d39ead707633d (patch) | |
| tree | d09ada82fc8f395a7c2d43712dbed7bc8602a29c | |
| parent | 5df3c10070057c0846f195065d3716520e091421 (diff) | |
fix location of change tracking boxes in Online
Change-Id: I65fcb52e224dce7df2a5a7baed2b8f23d0d49397
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108849
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/chgtrack.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 6a88eb05701b..86cab63684f9 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -4832,12 +4832,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", static_cast<sal_Int32>(nIndex)); OUString sAuthor; diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 86be82346c47..7abcc01864ac 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -4682,7 +4682,7 @@ static void lcl_getTrackedChange(ScDocument& rDoc, int nIndex, const ScChangeAct if (pAction->GetType() != SC_CAT_CONTENT) return; - auto redlinesNode = rRedlines.startNode(""); + auto redlinesNode = rRedlines.startStruct(); rRedlines.put("index", static_cast<sal_Int64>(nIndex)); rRedlines.put("author", pAction->GetUser()); @@ -4701,7 +4701,7 @@ static void lcl_getTrackedChange(ScDocument& rDoc, 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 9c457cf49c19..7fa248a90e65 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3269,7 +3269,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; @@ -3280,7 +3280,7 @@ void SwXTextDocument::getTrackedChanges(tools::JsonWriter& rJson) = m_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( |