[Libreoffice-commits] core.git: oox/source sd/qa

[Paul Trojahn]

 oox/source/export/shapes.cxx           |    2 +-
 sd/qa/unit/data/odp/group_rotation.odp |binary
 sd/qa/unit/export-tests-ooxml2.cxx     |   15 +++++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 465092047d5fa6ec6dd369372e712d76554570ff
Author: Paul Trojahn <paul.trojahn at gmail.com>
Date:   Sat Sep 23 15:17:13 2017 +0200

    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 at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 05ea273d2612..f1073262da70 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -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);
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
Binary files /dev/null and b/sd/qa/unit/data/odp/group_rotation.odp 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();