From 2dc030922eb7991befcc9ea02ef2e400fca65141 Mon Sep 17 00:00:00 2001 From: Gülşah Köse Date: Fri, 22 Nov 2019 14:05:24 +0300 Subject: tdf#128952 Set the position of shape for 180 deg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the rotation value is 180, 540, 900... degree with mirror pShape->GetRotateAngle() returns 0. In that control 0 means no rotation but that is not true. For that cases (180, 540, 900) after the angle conversition GetRotateAngle() returns 0. We should recalculate the position for 0 too. Change-Id: I14e981235b2d6cd8382d4c9e151bccd2e73a3fd9 Reviewed-on: https://gerrit.libreoffice.org/83468 Tested-by: Jenkins Reviewed-by: Gülşah Köse (cherry picked from commit aca2e4d270f472b2cbdb9084a55f1855529ea705) Reviewed-on: https://gerrit.libreoffice.org/83535 Reviewed-by: Andras Timar --- sd/qa/unit/data/pptx/tdf128952.pptx | Bin 0 -> 25578 bytes sd/qa/unit/export-tests-ooxml1.cxx | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 sd/qa/unit/data/pptx/tdf128952.pptx (limited to 'sd') diff --git a/sd/qa/unit/data/pptx/tdf128952.pptx b/sd/qa/unit/data/pptx/tdf128952.pptx new file mode 100644 index 000000000000..242a3ee9ace5 Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf128952.pptx differ diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index a0cd3b837af3..6048cb850e2e 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -103,6 +103,7 @@ public: void testParaMarginAndindentation(); void testTdf111884(); void testTdf112633(); + void testTdf128952(); void testCustomXml(); void testTdf94238(); void testPictureTransparency(); @@ -136,6 +137,7 @@ public: CPPUNIT_TEST(testParaMarginAndindentation); CPPUNIT_TEST(testTdf111884); CPPUNIT_TEST(testTdf112633); + CPPUNIT_TEST(testTdf128952); CPPUNIT_TEST(testCustomXml); CPPUNIT_TEST(testTdf94238); CPPUNIT_TEST(testTdf125554); @@ -829,6 +831,21 @@ void SdOOXMLExportTest1::testTdf112633() CPPUNIT_ASSERT_EQUAL(true, bool(xNameAccess->hasByName("ppt/media/hdphoto1.wdp"))); } +void SdOOXMLExportTest1::testTdf128952() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf128952.pptx"), PPTX); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + xDocShRef->DoClose(); + + xmlDocPtr pXmlDoc = parseExport(tempFile, "ppt/slides/slide1.xml"); + + assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:xfrm/a:off", "x", "360"); + assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:xfrm/a:off", "y", "-360"); + assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:xfrm/a:ext", "cx", "1919880"); + assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:xfrm/a:ext", "cy", "1462680"); +} + void SdOOXMLExportTest1::testCustomXml() { // Load document and export it to a temporary file -- cgit