diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-10-24 22:39:08 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-11-06 20:20:58 +0100 |
| commit | 25470a3cf04c0244a1bcda46d7064a7c727ae65f (patch) | |
| tree | 7d38edcc67087813d58db29f27de6853bf9f0982 /sd | |
| parent | 08fa0c2d549a662857028783a10292667058fc1d (diff) | |
PPTX export: correct position of rotated groups
* added testcase for tdf#113263
Change-Id: I7abf68d8fb4ffd8b883cfbf4d69916912add8182
Reviewed-on: https://gerrit.libreoffice.org/43794
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/43990
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sd')
| -rwxr-xr-x | sd/qa/unit/data/pptx/group-rot.pptx | bin | 0 -> 39796 bytes | |||
| -rwxr-xr-x | sd/qa/unit/data/pptx/group.pptx | bin | 0 -> 69168 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 30 |
3 files changed, 30 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/group-rot.pptx b/sd/qa/unit/data/pptx/group-rot.pptx Binary files differnew file mode 100755 index 000000000000..11b2d6367da0 --- /dev/null +++ b/sd/qa/unit/data/pptx/group-rot.pptx diff --git a/sd/qa/unit/data/pptx/group.pptx b/sd/qa/unit/data/pptx/group.pptx Binary files differnew file mode 100755 index 000000000000..8895fe2a2203 --- /dev/null +++ b/sd/qa/unit/data/pptx/group.pptx diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index ef4b5f90aebf..9722d2de9b36 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -107,6 +107,8 @@ public: void testTdf112557(); void testTdf112647(); void testSmartartRotation2(); + void testGroupsPosition(); + void testGroupsRotatedPosition(); void testAccentColor(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest2); @@ -136,6 +138,8 @@ public: CPPUNIT_TEST(testTdf112557); CPPUNIT_TEST(testTdf112647); CPPUNIT_TEST(testSmartartRotation2); + CPPUNIT_TEST(testGroupsPosition); + CPPUNIT_TEST(testGroupsRotatedPosition); CPPUNIT_TEST(testAccentColor); CPPUNIT_TEST_SUITE_END(); @@ -846,6 +850,32 @@ void SdOOXMLExportTest2::testSmartartRotation2() assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[3]/p:txBody/a:bodyPr", "rot", "10800000"); } +void SdOOXMLExportTest2::testGroupsPosition() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/group.pptx"), PPTX); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + xDocShRef->DoClose(); + + xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:xfrm/a:off", "x", "4817880"); + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:xfrm/a:off", "y", "1810440"); + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:xfrm/a:off", "x", "457200"); + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:xfrm/a:off", "y", "1798560"); +} + +void SdOOXMLExportTest2::testGroupsRotatedPosition() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/group-rot.pptx"), PPTX); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + xDocShRef->DoClose(); + + xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:xfrm/a:off", "x", "2857320"); + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:xfrm/a:off", "y", "4026960"); +} + void SdOOXMLExportTest2::testAccentColor() { ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/accent-color.pptx"), PPTX); |