Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 51 insertions, 0 deletions

diff --git a/sw/qa/core/docnode/data/redline-ends-before-toc.docx b/sw/qa/core/docnode/data/redline-ends-before-toc.docx
new file mode 100644
index 000000000..7696b3532
--- /dev/null
+++ b/sw/qa/core/docnode/data/redline-ends-before-toc.docx
diff --git a/sw/qa/core/docnode/data/tdf150086.docx b/sw/qa/core/docnode/data/tdf150086.docx
new file mode 100644
index 000000000..063e68df6
--- /dev/null
+++ b/sw/qa/core/docnode/data/tdf150086.docx
diff --git a/sw/qa/core/docnode/docnode.cxx b/sw/qa/core/docnode/docnode.cxx
new file mode 100644
index 000000000..4967b95d9
--- /dev/null
+++ b/sw/qa/core/docnode/docnode.cxx
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <swmodeltestbase.hxx>
+
+#include <IDocumentRedlineAccess.hxx>
+#include <redline.hxx>
+#include <doc.hxx>
+#include <docary.hxx>
+
+constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/docnode/data/";
+
+/// Covers sw/source/core/docnode/ fixes.
+class Test : public SwModelTestBase
+{
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testRedlineEndsBeforeToC)
+{
+    // Load a document where a delete redline ends right before a ToC, then redlines are hidden at a
+    // layout level.
+    SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "redline-ends-before-toc.docx");
+    const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+    // Without the accompanying fix in place, this test would have resulted in an assertion failure
+    // in InsertCnt_(), because the start of the section was hidden, but not its end.
+    CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(2), rTable.size());
+
+    // The redline contained the newline, too
+    CPPUNIT_ASSERT_EQUAL(OUString("<add-table-of-content>"), rTable[0]->GetText());
+}
+
+CPPUNIT_TEST_FIXTURE(Test, testTdf150086)
+{
+    // Load a document where an insert redline ends right before a ToC
+    SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf150086.docx");
+    const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+    CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(8), rTable.size());
+
+    // This was "Conte" (stripped redline)
+    CPPUNIT_ASSERT_EQUAL(OUString("Content\n"), rTable[6]->GetText());
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */