summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorPaul Trojahn <paul.trojahn@gmail.com>2017-09-23 15:17:13 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2017-09-26 23:21:10 +0200
commit465092047d5fa6ec6dd369372e712d76554570ff (patch)
treefed5f427c41c35f4be5be69bf382b90e166afe01 /sd
parent19f41fce02b83e9a076b5f97c22b5a8926fb6144 (diff)
PPTX Fix export of rotated group shapes
The rotation is already applied to the child shapes and must not be added to the group. Change-Id: Ic564cbcf31a81a248878f0179fdd21144f076b61 Reviewed-on: https://gerrit.libreoffice.org/42765 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/qa/unit/data/odp/group_rotation.odpbin0 -> 10429 bytes
-rw-r--r--sd/qa/unit/export-tests-ooxml2.cxx15
2 files changed, 15 insertions, 0 deletions
diff --git a/sd/qa/unit/data/odp/group_rotation.odp b/sd/qa/unit/data/odp/group_rotation.odp
new file mode 100644
index 000000000000..92568c1500d9
--- /dev/null
+++ b/sd/qa/unit/data/odp/group_rotation.odp
Binary files differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 9707407efb61..fa28714b4f27 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -117,6 +117,7 @@ public:
void testTdf112089();
void testTdf112086();
void testTdf112647();
+ void testGroupRotation();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@ -159,6 +160,7 @@ public:
CPPUNIT_TEST(testTdf112089);
CPPUNIT_TEST(testTdf112086);
CPPUNIT_TEST(testTdf112647);
+ CPPUNIT_TEST(testGroupRotation);
CPPUNIT_TEST_SUITE_END();
@@ -1204,6 +1206,19 @@ void SdOOXMLExportTest2::testTdf112647()
xDocShRef->DoClose();
}
+void SdOOXMLExportTest2::testGroupRotation()
+{
+ ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/group_rotation.odp"), ODP);
+ utl::TempFile tempFile;
+ xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+ xDocShRef->DoClose();
+
+ xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+ assertXPathNoAttribute(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:grpSpPr/a:xfrm", "rot");
+ assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[1]/p:spPr/a:xfrm", "rot", "20400000");
+ assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[2]/p:spPr/a:xfrm", "rot", "20400000");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
CPPUNIT_PLUGIN_IMPLEMENT();