Kaydet (Commit) 46509204 authored tarafından Paul Trojahn's avatar Paul Trojahn Kaydeden (comit) Tamás Zolnai

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/42765Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
üst 19f41fce
......@@ -528,7 +528,7 @@ ShapeExport& ShapeExport::WriteGroupShape(const uno::Reference<drawing::XShape>&
// visual properties
pFS->startElementNS(mnXmlNamespace, XML_grpSpPr, FSEND);
WriteShapeTransformation(xShape, XML_a);
WriteShapeTransformation(xShape, XML_a, false, false, true);
pFS->endElementNS(mnXmlNamespace, XML_grpSpPr);
uno::Reference<drawing::XShapes> xGroupShape(xShape, uno::UNO_QUERY_THROW);
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment