emfio/qa/cppunit/emf/EmfImportTest.cxx | 15 ++++++--------- emfio/source/reader/mtftools.cxx | 1 + 2 files changed, 7 insertions(+), 9 deletions(-)
New commits: commit ed9276531613731f81d05854054b8aae1e1df61a Author: Paris Oplopoios <[email protected]> AuthorDate: Mon Dec 12 11:30:27 2022 +0000 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Dec 13 15:41:12 2022 +0000 tdf#152435 Revert "Make EMR_SAVEDC not UpdateClipRegion" This reverts commit 1230b88055c7389d2c376c316f91549e4aaef8aa. Reason for revert: The reverted commit breaks the files documented in tdf#152435 (some text is not shown in those .EMF files). The reverted commit would solve an issue where some text was not clipped correctly, albeit in a naive way. As it is more important that text is shown rather than some text having correct clipping, that patch is reverted and I will look for one that fixes both cases. Change-Id: I42e85b802b8bf1e77e96f0016cd1d83201047032 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143970 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> (cherry picked from commit 75093a9f7fbde760a3034f41694739c7454cb7eb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144029 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index 3d77dd95e5a0..75f2b9001a08 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -1019,19 +1019,16 @@ void Test::TestEmfPlusSave() assertXPath(pDocument, aXPathPrefix + "mask/polypolygon", "path", "m0 0h33544v21311h-33544z"); - assertXPath(pDocument, aXPathPrefix + "mask/group/mask/polypolygoncolor[1]/polypolygon", "path", + assertXPath(pDocument, aXPathPrefix + "mask/group/mask/polypolygoncolor/polypolygon", "path", "m327.458333333333 638.222222222222h437007.1875v295555.555555556h-437007.1875z"); - assertXPath(pDocument, aXPathPrefix + "mask/group/mask/polypolygoncolor[1]", "color", - "#ff0cad"); + assertXPath(pDocument, aXPathPrefix + "mask/group/mask/polypolygoncolor", "color", "#ff0cad"); - assertXPath(pDocument, aXPathPrefix + "mask/group/mask/polypolygoncolor[2]/polypolygon", "path", + assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor/polypolygon", "path", "m10853.4145539602 7321.41354709201h41952690v29630720h-41952690z"); - assertXPath(pDocument, aXPathPrefix + "mask/group/mask/polypolygoncolor[2]", "color", - "#00ffad"); + assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor", "color", "#00ffad"); - assertXPath(pDocument, aXPathPrefix + "mask/group/mask/polygonstrokearrow/line", "color", - "#000000"); - assertXPathContent(pDocument, aXPathPrefix + "mask/group/mask/polygonstrokearrow/polygon", + assertXPath(pDocument, aXPathPrefix + "mask/polygonstrokearrow/line", "color", "#000000"); + assertXPathContent(pDocument, aXPathPrefix + "mask/polygonstrokearrow/polygon", "10853.4145539602,7321.41354709201 10853.4145539602,4907.54325697157 " "12832.6557236512,4907.54325697157"); } diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index 2683151166b2..7f067e4fcd15 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -2365,6 +2365,7 @@ namespace emfio void MtfTools::Push() // !! to be able to access the original ClipRegion it { // is not allowed to use the MetaPushAction() + UpdateClipRegion(); // (the original clip region is on top of the stack) (SJ) auto pSave = std::make_shared<SaveStruct>(); pSave->aLineStyle = maLineStyle;
