diff options
| author | Tünde Tóth <toth.tunde@nisz.hu> | 2021-01-06 13:24:10 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-01-18 10:58:30 +0100 |
| commit | 6492679040db6415543119ada9d1124bd532ec6a (patch) | |
| tree | 875b2829ead6934a6bbbb6ea12d9e9c16f644259 /sd | |
| parent | ad3b51b5b383dc9c7302b6d1d2e7f6daad5d4d5b (diff) | |
tdf#61028 OOXML export: fix lost arcTo shape
a:custGeom was exported without the a:arcTo element
and its attributes.
Note: see customshapegeometry.cxx for import of a:arcTo
attributes.
Change-Id: I611ea9fb6a81d45cfd52a16abbb37071ea0ce7d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108874
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109446
Tested-by: Jenkins
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/arc-validiert.pptx | bin | 0 -> 14393 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml1.cxx | 18 |
2 files changed, 18 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/arc-validiert.pptx b/sd/qa/unit/data/pptx/arc-validiert.pptx Binary files differnew file mode 100644 index 000000000000..163f187b0bcc --- /dev/null +++ b/sd/qa/unit/data/pptx/arc-validiert.pptx diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 75222f267a58..b1d3eb57f8f2 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -100,6 +100,7 @@ public: void testTdf128345GradientAxial(); void testTdf134969TransparencyOnColorGradient(); void testTdf136911(); + void testArcTo(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest1); @@ -149,6 +150,7 @@ public: CPPUNIT_TEST(testTdf128345GradientAxial); CPPUNIT_TEST(testTdf134969TransparencyOnColorGradient); CPPUNIT_TEST(testTdf136911); + CPPUNIT_TEST(testArcTo); CPPUNIT_TEST_SUITE_END(); @@ -1274,6 +1276,22 @@ void SdOOXMLExportTest1::testTdf134969TransparencyOnColorGradient() assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", "60000"); } +void SdOOXMLExportTest1::testArcTo() +{ + ::sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/arc-validiert.pptx"), PPTX); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + xDocShRef->DoClose(); + + xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/slides/slide1.xml"); + const OString sPath("//a:custGeom/a:pathLst/a:path/a:arcTo"); + assertXPath(pXmlDoc, sPath, "wR", "3"); + assertXPath(pXmlDoc, sPath, "hR", "3"); + assertXPath(pXmlDoc, sPath, "stAng", "1800000"); + assertXPath(pXmlDoc, sPath, "swAng", "2700000"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest1); CPPUNIT_PLUGIN_IMPLEMENT(); |