diff options
| author | nd101 <Fong@nd.com.cn> | 2020-05-09 11:45:25 +0800 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-07-29 12:03:34 +0200 |
| commit | 2b19cd84f10552c438dace0a4c52a70ccd440369 (patch) | |
| tree | 8aa6e793074cf336b115f4c06f543aacb92e4cf5 /test/source | |
| parent | 5ad17c85dc93973c0cbb1d633b9eed144f0677de (diff) | |
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 <vmiklos@collabora.com>
Diffstat (limited to 'test/source')
| -rw-r--r-- | test/source/xmltesttools.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
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); |