From 267c6f2ac71f92999e969232431ba04678e7437e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 07:54:39 +0200 Subject: Adding upstream version 4:24.2.0. Signed-off-by: Daniel Baumann --- .../core/docnode/data/redline-ends-before-toc.docx | Bin 0 -> 12285 bytes sw/qa/core/docnode/data/tdf150086.docx | Bin 0 -> 16321 bytes sw/qa/core/docnode/data/tdf156267.docx | Bin 0 -> 103390 bytes sw/qa/core/docnode/docnode.cxx | 71 +++++++++++++++++++++ 4 files changed, 71 insertions(+) create mode 100644 sw/qa/core/docnode/data/redline-ends-before-toc.docx create mode 100644 sw/qa/core/docnode/data/tdf150086.docx create mode 100644 sw/qa/core/docnode/data/tdf156267.docx create mode 100644 sw/qa/core/docnode/docnode.cxx (limited to 'sw/qa/core/docnode') 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 0000000000..7696b3532e Binary files /dev/null and b/sw/qa/core/docnode/data/redline-ends-before-toc.docx differ diff --git a/sw/qa/core/docnode/data/tdf150086.docx b/sw/qa/core/docnode/data/tdf150086.docx new file mode 100644 index 0000000000..063e68df68 Binary files /dev/null and b/sw/qa/core/docnode/data/tdf150086.docx differ diff --git a/sw/qa/core/docnode/data/tdf156267.docx b/sw/qa/core/docnode/data/tdf156267.docx new file mode 100644 index 0000000000..f782ed0c95 Binary files /dev/null and b/sw/qa/core/docnode/data/tdf156267.docx differ diff --git a/sw/qa/core/docnode/docnode.cxx b/sw/qa/core/docnode/docnode.cxx new file mode 100644 index 0000000000..9521c67b8e --- /dev/null +++ b/sw/qa/core/docnode/docnode.cxx @@ -0,0 +1,71 @@ +/* -*- 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 + +#include +#include +#include +#include + +/// Covers sw/source/core/docnode/ fixes. +class Test : public SwModelTestBase +{ +public: + Test() + : SwModelTestBase("/sw/qa/core/docnode/data/") + { + } +}; + +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. + createSwDoc("redline-ends-before-toc.docx"); + SwDoc* pDoc = getSwDoc(); + 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(2), rTable.size()); + + // The redline contained the newline, too + CPPUNIT_ASSERT_EQUAL(OUString(""), rTable[0]->GetText()); +} + +CPPUNIT_TEST_FIXTURE(Test, testTdf150086) +{ + // Load a document where an insert redline ends right before a ToC + createSwDoc("tdf150086.docx"); + SwDoc* pDoc = getSwDoc(); + const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable(); + CPPUNIT_ASSERT_EQUAL(static_cast(8), rTable.size()); + + // This was "Conte" (stripped redline) + CPPUNIT_ASSERT_EQUAL(OUString("Content\n"), rTable[6]->GetText()); +} + +CPPUNIT_TEST_FIXTURE(Test, testTdf156267) +{ + createSwDoc("tdf156267.docx"); + CPPUNIT_ASSERT_EQUAL(1, getPages()); + + dispatchCommand(mxComponent, ".uno:SelectAll", {}); + dispatchCommand(mxComponent, ".uno:Copy", {}); + dispatchCommand(mxComponent, ".uno:Paste", {}); + + // Without the fix in place, it would have crashed here + dispatchCommand(mxComponent, ".uno:Undo", {}); + + CPPUNIT_ASSERT_EQUAL(1, getPages()); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3