diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2021-08-16 11:05:39 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-08-20 09:45:10 +0200 |
| commit | 6e9e0ad4e2ab485eefe1529d72d623101009e120 (patch) | |
| tree | 135eb0b7625a858b709c646c30c6c64d9c10b271 /sd | |
| parent | 0b327b69ef78a7565625dabbe8dcf0140884fe26 (diff) | |
tdf#143624 PPTX: slideshow setting “Manual forwarding” not exported
Follow-up to commit f8ddaaf0f5e1fb61e0d4404ea28757bc652ae4be
(tdf#142915 PPTX import: support for presentation's timing attribute).
Change-Id: I1b175d406d2cd0fc40ba7085517709fb477fed58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120529
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120751
Tested-by: Jenkins
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/tdf143624.pptx | bin | 0 -> 33909 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml1.cxx | 16 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/tdf143624.pptx b/sd/qa/unit/data/pptx/tdf143624.pptx Binary files differnew file mode 100644 index 000000000000..1eed8fedaa03 --- /dev/null +++ b/sd/qa/unit/data/pptx/tdf143624.pptx diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 59848719adf0..b191cc62ee76 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -61,6 +61,7 @@ using namespace css; class SdOOXMLExportTest1 : public SdModelTestBaseXML { public: + void testTdf143624(); void testTdf142648(); void testTdf47365(); void testTdf125071(); @@ -123,6 +124,7 @@ public: CPPUNIT_TEST_SUITE(SdOOXMLExportTest1); + CPPUNIT_TEST(testTdf143624); CPPUNIT_TEST(testTdf142648); CPPUNIT_TEST(testTdf47365); CPPUNIT_TEST(testTdf125071); @@ -212,6 +214,20 @@ void checkFontAttributes( const SdrTextObj* pObj, ItemValue nVal, sal_uInt32 nId } +void SdOOXMLExportTest1::testTdf143624() +{ + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf143624.pptx"), PPTX ); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + xDocShRef->DoClose(); + + xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/presProps.xml"); + + assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "useTimings", "0"); + + assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "showNarration", "1"); +} + void SdOOXMLExportTest1::testTdf142648() { sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf142648.pptx"), PPTX ); diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 0cf86db84340..2797b296abcf 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -1067,6 +1067,7 @@ void PowerPointExport::WritePresentationProps() Reference<beans::XPropertySet> xPresentationProps(xPresentationSupplier->getPresentation(), uno::UNO_QUERY); bool bEndlessVal = xPresentationProps->getPropertyValue("IsEndless").get<bool>(); + bool bChangeManually = xPresentationProps->getPropertyValue("IsAutomatic").get<bool>(); OUString sFirstPage = xPresentationProps->getPropertyValue("FirstPage").get<OUString>(); OUString sCustomShow = xPresentationProps->getPropertyValue("CustomShow").get<OUString>(); @@ -1080,6 +1081,7 @@ void PowerPointExport::WritePresentationProps() pFS->startElementNS(XML_p, XML_presentationPr, PPRNMSS); pFS->startElementNS(XML_p, XML_showPr, XML_loop, sax_fastparser::UseIf("1", bEndlessVal), + XML_useTimings, sax_fastparser::UseIf("0", bChangeManually), XML_showNarration, "1"); Reference<drawing::XDrawPagesSupplier> xDPS(mXModel, uno::UNO_QUERY_THROW); |