From 2b19cd84f10552c438dace0a4c52a70ccd440369 Mon Sep 17 00:00:00 2001 From: nd101 Date: Sat, 9 May 2020 11:45:25 +0800 Subject: tdf#115753 fix table border missing when there are merged cells Remove code that ignores merged cells. Change-Id: I907220e9ffc9d18561171efd7d6b39d14a8341fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93836 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- test/source/xmltesttools.cxx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx index 27833af1e90d..defb2ec2d096 100644 --- a/test/source/xmltesttools.cxx +++ b/test/source/xmltesttools.cxx @@ -59,8 +59,16 @@ xmlDocUniquePtr XmlTestTools::parseXmlStream(SvStream* pStream) return xmlDocUniquePtr(xmlParseDoc(pCharBuffer)); } -xmlDocUniquePtr XmlTestTools::dumpAndParse(MetafileXmlDump& rDumper, const GDIMetaFile& rGDIMetaFile) +xmlDocUniquePtr XmlTestTools::dumpAndParse(MetafileXmlDump& rDumper, const GDIMetaFile& rGDIMetaFile, const OUString& rStreamName) { + 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); -- cgit v1.2.3