From 7ccd8928acbb5a27d9b9f44b09b7575757981e8a Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Tue, 22 Sep 2020 18:34:46 +0200 Subject: [PATCH] tdf#136949: Revert "tdf#115753 fix table border missing when there are merged cells" This reverts commit 2b19cd84f10552c438dace0a4c52a70ccd440369. Change-Id: I5f3f51e0e816416c364155ab67bc37bb8c6fe545 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103187 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- include/test/xmltesttools.hxx | 2 +- sd/qa/unit/data/pptx/tdf115753.pptx | Bin 34324 -> 0 bytes sd/qa/unit/export-tests.cxx | 45 --------------------- svx/source/table/viewcontactoftableobj.cxx | 14 +++++++ test/source/xmltesttools.cxx | 10 +---- 5 files changed, 16 insertions(+), 55 deletions(-) delete mode 100644 sd/qa/unit/data/pptx/tdf115753.pptx diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx index a23b55986b42..f69255b9b85f 100644 --- a/include/test/xmltesttools.hxx +++ b/include/test/xmltesttools.hxx @@ -35,7 +35,7 @@ public: /// Return xmlDocPtr representation of the XML stream read from pStream. static xmlDocUniquePtr parseXmlStream(SvStream* pStream); - static xmlDocUniquePtr dumpAndParse(MetafileXmlDump& rDumper, const GDIMetaFile& rGDIMetaFile, const OUString& rStreamName = OUString()); + static xmlDocUniquePtr dumpAndParse(MetafileXmlDump& rDumper, const GDIMetaFile& rGDIMetaFile); protected: XmlTestTools(); diff --git a/sd/qa/unit/data/pptx/tdf115753.pptx b/sd/qa/unit/data/pptx/tdf115753.pptx deleted file mode 100644 index 0350ddaad44c6ee576b72cbbd847a2ee8e4826bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34324 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 #include #include -#include #include -#include #include #include #include #include -#include #include #include #include @@ -80,7 +77,6 @@ public: void testGlow(); void testSoftEdges(); void testShadowBlur(); - void testTdf115753(); void testRhbz1870501(); CPPUNIT_TEST_SUITE(SdExportTest); @@ -119,7 +115,6 @@ public: CPPUNIT_TEST(testGlow); CPPUNIT_TEST(testSoftEdges); CPPUNIT_TEST(testShadowBlur); - CPPUNIT_TEST(testTdf115753); CPPUNIT_TEST(testRhbz1870501); CPPUNIT_TEST_SUITE_END(); @@ -556,46 +551,6 @@ void SdExportTest::testBnc480256() xDocShRef->DoClose(); } -void SdExportTest::testTdf115753() -{ - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf115753.pptx"), PPTX); - xDocShRef = saveAndReload(xDocShRef.get(), PPTX); - uno::Reference< drawing::XDrawPagesSupplier > xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW); - uno::Reference< drawing::XDrawPage > xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW); - uno::Reference< drawing::XShape > xShape(xPage->getByIndex(0), uno::UNO_QUERY_THROW); - - // Save the first shape to a metafile. - uno::Reference xGraphicExporter = drawing::GraphicExportFilter::create(comphelper::getProcessComponentContext()); - uno::Reference xSourceDoc(xShape, uno::UNO_QUERY); - xGraphicExporter->setSourceDocument(xSourceDoc); - - SvMemoryStream aStream; - uno::Reference xOutputStream(new utl::OStreamWrapper(aStream)); - uno::Sequence aDescriptor(comphelper::InitPropertySequence({ - { "OutputStream", uno::Any(xOutputStream) }, - { "FilterName", uno::Any(OUString("SVM")) } - })); - xGraphicExporter->filter(aDescriptor); - aStream.Seek(STREAM_SEEK_TO_BEGIN); - - // Read it back and dump it as an XML file. - Graphic aGraphic; - ReadGraphic(aStream, aGraphic); - const GDIMetaFile& rMetaFile = aGraphic.GetGDIMetaFile(); - MetafileXmlDump dumper; - - xmlDocUniquePtr pXmlDoc = XmlTestTools::dumpAndParse(dumper, rMetaFile); - CPPUNIT_ASSERT(pXmlDoc); - // Without the fix in place, it will print: - // - Expected: 21180 - // - Actual : 12714 - // because without the fix, one of the border lines is missing, - // and the value, which is where the line ends, will be shorter - // than it should be. - assertXPath(pXmlDoc, "/metafile/push[6]/polyline/point[2]", "x", "21180"); - xDocShRef->DoClose(); -} - void SdExportTest::testUnknownAttributes() { ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/unknown-attribute.fodp"), FODP); diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index d2778e333383..fe6d03f1d900 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -254,6 +254,20 @@ namespace sdr::contact aArray.SetCellStyleRight(aCellPos.mnCol, aCellPos.mnRow, impGetLineStyle(rTableLayouter, aCellPos.mnCol + 1, aCellPos.mnRow, false, nColCount, nRowCount, bIsRTL)); aArray.SetCellStyleTop(aCellPos.mnCol, aCellPos.mnRow, impGetLineStyle(rTableLayouter, aCellPos.mnCol, aCellPos.mnRow, true, nColCount, nRowCount, bIsRTL)); aArray.SetCellStyleBottom(aCellPos.mnCol, aCellPos.mnRow, impGetLineStyle(rTableLayouter, aCellPos.mnCol, aCellPos.mnRow + 1, true, nColCount, nRowCount, bIsRTL)); + + // ignore merged cells (all except the top-left of a merged cell) + if(!xCurrentCell->isMerged()) + { + // check if we are the top-left of a merged cell + const sal_Int32 nXSpan(xCurrentCell->getColumnSpan()); + const sal_Int32 nYSpan(xCurrentCell->getRowSpan()); + + if(nXSpan > 1 || nYSpan > 1) + { + // if merged, set so at CellBorderArray for primitive creation + aArray.SetMergedRange(aCellPos.mnCol, aCellPos.mnRow, aCellPos.mnCol + nXSpan - 1, aCellPos.mnRow + nYSpan - 1); + } + } } if(xCurrentCell.is() && !xCurrentCell->isMerged()) diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx index defb2ec2d096..27833af1e90d 100644 --- a/test/source/xmltesttools.cxx +++ b/test/source/xmltesttools.cxx @@ -59,16 +59,8 @@ xmlDocUniquePtr XmlTestTools::parseXmlStream(SvStream* pStream) return xmlDocUniquePtr(xmlParseDoc(pCharBuffer)); } -xmlDocUniquePtr XmlTestTools::dumpAndParse(MetafileXmlDump& rDumper, const GDIMetaFile& rGDIMetaFile, const OUString& rStreamName) +xmlDocUniquePtr XmlTestTools::dumpAndParse(MetafileXmlDump& rDumper, const GDIMetaFile& rGDIMetaFile) { - if (!rStreamName.isEmpty()) - { - SvStream *pStream = new SvFileStream(rStreamName, StreamMode::STD_READWRITE | StreamMode::TRUNC); - rDumper.dump(rGDIMetaFile, *pStream); - pStream->Seek(STREAM_SEEK_TO_BEGIN); - return XmlTestTools::parseXmlStream(pStream); - } - SvMemoryStream aStream; rDumper.dump(rGDIMetaFile, aStream); aStream.Seek(STREAM_SEEK_TO_BEGIN);