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 --- sw/qa/core/layout/paintfrm.cxx | 163 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 sw/qa/core/layout/paintfrm.cxx (limited to 'sw/qa/core/layout/paintfrm.cxx') diff --git a/sw/qa/core/layout/paintfrm.cxx b/sw/qa/core/layout/paintfrm.cxx new file mode 100644 index 0000000000..b5990648b2 --- /dev/null +++ b/sw/qa/core/layout/paintfrm.cxx @@ -0,0 +1,163 @@ +/* -*- 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 + +namespace +{ +/// Covers sw/source/core/layout/paintfrm.cxx fixes. +class Test : public SwModelTestBase +{ +public: + Test() + : SwModelTestBase("/sw/qa/core/layout/data/") + { + } +}; + +CPPUNIT_TEST_FIXTURE(Test, testSplitTableBorder) +{ + // Given a document with a split table, table borders are defined, but cell borders are not: + createSwDoc("split-table-border.odt"); + SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); + SwDocShell* pShell = pTextDoc->GetDocShell(); + + // When rendering that document: + std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile(); + + // Then make sure that the master table has a bottom border and the follow table has a top + // border: + MetafileXmlDump aDumper; + xmlDocUniquePtr pXmlDoc = dumpAndParse(aDumper, *xMetaFile); + xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, "//polyline[@style='solid']/point"_ostr); + xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval; + int nHorizontalBorders = 0; + // Count the horizontal borders: + for (int i = 0; i < xmlXPathNodeSetGetLength(pXmlNodes); i += 2) + { + xmlNodePtr pStart = pXmlNodes->nodeTab[i]; + xmlNodePtr pEnd = pXmlNodes->nodeTab[i + 1]; + xmlChar* pStartY = xmlGetProp(pStart, BAD_CAST("y")); + xmlChar* pEndY = xmlGetProp(pEnd, BAD_CAST("y")); + sal_Int32 nStartY = o3tl::toInt32(reinterpret_cast(pStartY)); + sal_Int32 nEndY = o3tl::toInt32(reinterpret_cast(pEndY)); + if (nStartY != nEndY) + { + // Vertical border. + continue; + } + + ++nHorizontalBorders; + } + xmlXPathFreeObject(pXmlObj); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 4 + // - Actual : 2 + // i.e. the bottom border in the master table and the top border in the follow table were + // missing. + CPPUNIT_ASSERT_EQUAL(4, nHorizontalBorders); +} + +CPPUNIT_TEST_FIXTURE(Test, testRTLBorderMerge) +{ + // Given a document with an RTL table: + createSwDoc("rtl-table.docx"); + SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); + SwDocShell* pShell = pTextDoc->GetDocShell(); + + // When rendering that document: + std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile(); + + // Then make sure the 5 columns all have left and right vertical borders: + MetafileXmlDump aDumper; + xmlDocUniquePtr pXmlDoc = dumpAndParse(aDumper, *xMetaFile); + xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, "//polyline[@style='solid']/point"_ostr); + xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval; + int nVerticalBorders = 0; + // Count the vertical borders: + for (int i = 0; i < xmlXPathNodeSetGetLength(pXmlNodes); i += 2) + { + xmlNodePtr pStart = pXmlNodes->nodeTab[i]; + xmlNodePtr pEnd = pXmlNodes->nodeTab[i + 1]; + xmlChar* pStartY = xmlGetProp(pStart, BAD_CAST("y")); + xmlChar* pEndY = xmlGetProp(pEnd, BAD_CAST("y")); + sal_Int32 nStartY = o3tl::toInt32(reinterpret_cast(pStartY)); + sal_Int32 nEndY = o3tl::toInt32(reinterpret_cast(pEndY)); + if (nStartY == nEndY) + { + // Horizontal border. + continue; + } + + ++nVerticalBorders; + } + xmlXPathFreeObject(pXmlObj); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 6 + // - Actual : 4 + // i.e. the 2nd and 5th vertical border was missing. + CPPUNIT_ASSERT_EQUAL(6, nVerticalBorders); +} + +CPPUNIT_TEST_FIXTURE(Test, testSplitTableMergedBorder) +{ + // Given a document with a split table, first row in frame 1 has merged cells: + createSwDoc("split-table-merged-border.odt"); + SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); + SwDocShell* pShell = pTextDoc->GetDocShell(); + + // When rendering that document: + std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile(); + + // Then make sure that the master table has a bottom border with the correct widths: + MetafileXmlDump aDumper; + xmlDocUniquePtr pXmlDoc = dumpAndParse(aDumper, *xMetaFile); + xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, "//polyline[@style='solid']/point"_ostr); + xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval; + std::set aHorizontalBorderStarts; + std::set aHorizontalBorderEnds; + // Collect the horizontal borders: + for (int i = 0; i < xmlXPathNodeSetGetLength(pXmlNodes); i += 2) + { + xmlNodePtr pStart = pXmlNodes->nodeTab[i]; + xmlNodePtr pEnd = pXmlNodes->nodeTab[i + 1]; + xmlChar* pStartY = xmlGetProp(pStart, BAD_CAST("y")); + xmlChar* pEndY = xmlGetProp(pEnd, BAD_CAST("y")); + sal_Int32 nStartY = o3tl::toInt32(reinterpret_cast(pStartY)); + sal_Int32 nEndY = o3tl::toInt32(reinterpret_cast(pEndY)); + if (nStartY != nEndY) + { + // Vertical border. + continue; + } + + xmlChar* pStartX = xmlGetProp(pStart, BAD_CAST("x")); + xmlChar* pEndX = xmlGetProp(pEnd, BAD_CAST("x")); + sal_Int32 nStartX = o3tl::toInt32(reinterpret_cast(pStartX)); + sal_Int32 nEndX = o3tl::toInt32(reinterpret_cast(pEndX)); + aHorizontalBorderStarts.insert(nStartX); + aHorizontalBorderEnds.insert(nEndX); + } + xmlXPathFreeObject(pXmlObj); + CPPUNIT_ASSERT_EQUAL(static_cast(2), aHorizontalBorderStarts.size()); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 2 + // - Actual : 3 + // i.e. the frame 1 bottom border ended sooner than expected, resulting in a buggy, partial + // bottom border. + CPPUNIT_ASSERT_EQUAL(static_cast(2), aHorizontalBorderEnds.size()); +} +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3