diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2020-11-05 14:19:03 +0300 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2020-11-05 17:05:46 +0100 |
| commit | 9f3b85dc29326e779ccc6be3b649b7fb24571ee0 (patch) | |
| tree | 362dfe7e4f7b4997f5b9b6426cb36058f84017cd /sd | |
| parent | 9890240055c774c55f125b6db6146536980295ab (diff) | |
tdf#128213 Fix export rotation problem.
Export code has written for case that we have normal
rotation angle and camera z rotation together. If object
has not normal rotation but have camera z rotation, problem occurs.
Camera z rotation info is already exist between <scene3d> tags. If we
have not <xfrm rot="..."> (normal rotation angle) we shouldn't add camera
rotation here.
Change-Id: I1819953c937783d30b6e7ced978758300bb56d7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105341
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/tdf128213.pptx | bin | 0 -> 16938 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 12 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/tdf128213.pptx b/sd/qa/unit/data/pptx/tdf128213.pptx Binary files differnew file mode 100644 index 000000000000..1f308128c367 --- /dev/null +++ b/sd/qa/unit/data/pptx/tdf128213.pptx diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 9f967b7963b9..e71c4f5ec904 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -193,6 +193,7 @@ public: void testTdf127379(); void testTdf98603(); void testTdf79082(); + void testTdf128213(); void testTdf129372(); void testShapeGlowEffect(); void testTdf119087(); @@ -312,6 +313,7 @@ public: CPPUNIT_TEST(testTdf127379); CPPUNIT_TEST(testTdf98603); CPPUNIT_TEST(testTdf79082); + CPPUNIT_TEST(testTdf128213); CPPUNIT_TEST(testTdf129372); CPPUNIT_TEST(testShapeGlowEffect); CPPUNIT_TEST(testTdf119087); @@ -2842,6 +2844,16 @@ void SdOOXMLExportTest2::testTdf98603() CPPUNIT_ASSERT_EQUAL(OUString("IL"), aLocale.Country); } +void SdOOXMLExportTest2::testTdf128213() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf128213.pptx"), PPTX); + utl::TempFile tempFile; + xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile ); + + xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); + assertXPathNoAttribute(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:xfrm", "rot"); +} + void SdOOXMLExportTest2::testTdf79082() { ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf79082.pptx"), PPTX); |