diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-09-22 15:56:28 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-24 17:24:07 +0200 |
commit | 2176657ce5ff01ef9f9571e3e193908692b7f04c (patch) | |
tree | 914ad4a057156c1b4ae1f8fa22f33ca9ee9f22d9 /sd | |
parent | 635ea3a8f12e3e7b0cc4283126e67b1057810029 (diff) |
tdf#112552: Shape's gray background is lost after saving to PPTX
Reviewed-on: https://gerrit.libreoffice.org/42598
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 31919b8909fa7b34412dd52c3d4dff17bc5b6fab)
Change-Id: I30f371ad301eede82ddcece4d91ffcd32e164115
Reviewed-on: https://gerrit.libreoffice.org/42648
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rwxr-xr-x | sd/qa/unit/data/odp/tdf112552.odp | bin | 0 -> 11331 bytes | |||
-rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 17 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sd/qa/unit/data/odp/tdf112552.odp b/sd/qa/unit/data/odp/tdf112552.odp Binary files differnew file mode 100755 index 000000000000..df4afb76b14a --- /dev/null +++ b/sd/qa/unit/data/odp/tdf112552.odp diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 0e6bd2542814..3300dc4efcac 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -101,6 +101,7 @@ public: void testTdf92076(); void testTdf59046(); void testTdf105739(); + void testTdf112552(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest2); @@ -125,6 +126,7 @@ public: CPPUNIT_TEST(testTdf92076); CPPUNIT_TEST(testTdf59046); CPPUNIT_TEST(testTdf105739); + CPPUNIT_TEST(testTdf112552); CPPUNIT_TEST_SUITE_END(); @@ -782,6 +784,21 @@ void SdOOXMLExportTest2::testTdf105739() } +void SdOOXMLExportTest2::testTdf112552() +{ + // Background fill was not displayed, but it was because of the wrong geometry + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf112552.odp"), ODP); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + + xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path", "w", "21600"); + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path", "h", "21600"); + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "21600"); + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "0"); + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2); CPPUNIT_PLUGIN_IMPLEMENT(); |