diff options
| author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2021-05-29 21:11:55 +0200 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2021-05-31 07:32:44 +0200 |
| commit | f275c4b31f095193b80cb756f8610c16282fb8f4 (patch) | |
| tree | 1e7f0bafd33392ebd00eb2faca3e588afea5357d /emfio/qa/cppunit | |
| parent | 363cf231c73673e8daf766aa6b24498f3e913e21 (diff) | |
tdf#53004 tdf#142495 WMF EMF Always display Text rectangle
In previous implementation if BKMode was set to Transparent,
then both Background of Text and Rectangle was not drawn.
It was wrong, and Rectangle should be always drawn.
This commit fix that issue and allows EMF images
exported by LTspice to be rendered correctly under LibreOffice.
Change-Id: I03801d35d92eb2a3fdc175ca1d5b348a2aa30842
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116394
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'emfio/qa/cppunit')
| -rw-r--r-- | emfio/qa/cppunit/emf/EmfImportTest.cxx | 18 | ||||
| -rw-r--r-- | emfio/qa/cppunit/emf/data/TestExtTextOutOpaqueAndClipTransform.emf | bin | 1232 -> 1416 bytes |
2 files changed, 15 insertions, 3 deletions
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index 1b134551c7ff..1613fe943e6f 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -519,12 +519,19 @@ void Test::TestExtTextOutOpaqueAndClipTransform() xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence)); CPPUNIT_ASSERT (pDocument); - assertXPath(pDocument, "/primitive2D/metafile/transform/textsimpleportion", + + assertXPath(pDocument, "/primitive2D/metafile/transform/textsimpleportion", 2); + assertXPath(pDocument, "/primitive2D/metafile/transform/textsimpleportion[1]", "text", "No_rect- DLP-"); - assertXPath(pDocument, "/primitive2D/metafile/transform/textsimpleportion", + assertXPath(pDocument, "/primitive2D/metafile/transform/textsimpleportion[1]", "fontcolor", "#000000"); - assertXPath(pDocument, "/primitive2D/metafile/transform/polypolygoncolor", 2); + assertXPath(pDocument, "/primitive2D/metafile/transform/textsimpleportion[2]", + "text", "OpaqueTranspa"); + assertXPath(pDocument, "/primitive2D/metafile/transform/textsimpleportion[2]", + "fontcolor", "#000000"); + + assertXPath(pDocument, "/primitive2D/metafile/transform/polypolygoncolor", 3); assertXPath(pDocument, "/primitive2D/metafile/transform/polypolygoncolor[1]/polypolygon", "path", "m966 490-477-275-84 147 476 275z"); assertXPath(pDocument, "/primitive2D/metafile/transform/polypolygoncolor[1]", @@ -535,6 +542,11 @@ void Test::TestExtTextOutOpaqueAndClipTransform() assertXPath(pDocument, "/primitive2D/metafile/transform/polypolygoncolor[2]", "color", "#0080ff"); + assertXPath(pDocument, "/primitive2D/metafile/transform/polypolygoncolor[3]/polypolygon", + "path", "m972 1326-476-275-148 257 476 276z"); + assertXPath(pDocument, "/primitive2D/metafile/transform/polypolygoncolor[3]", + "color", "#800080"); + assertXPath(pDocument, "/primitive2D/metafile/transform/group", 3); assertXPath(pDocument, "/primitive2D/metafile/transform/group[1]/polypolygoncolor", "color", "#ff0000"); diff --git a/emfio/qa/cppunit/emf/data/TestExtTextOutOpaqueAndClipTransform.emf b/emfio/qa/cppunit/emf/data/TestExtTextOutOpaqueAndClipTransform.emf Binary files differindex 7d59ac3e5bd2..0b7be5ab39ec 100644 --- a/emfio/qa/cppunit/emf/data/TestExtTextOutOpaqueAndClipTransform.emf +++ b/emfio/qa/cppunit/emf/data/TestExtTextOutOpaqueAndClipTransform.emf |