diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-09-22 16:08:23 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-24 17:24:43 +0200 |
| commit | 9b9e576368ae36704908086ebc94e5889a7d68e8 (patch) | |
| tree | c831cacce0200f1e592703fe442835430f2adf33 /sd | |
| parent | 2176657ce5ff01ef9f9571e3e193908692b7f04c (diff) | |
tdf#112557: Subtitle placeholder shape leads to corrupted PPTX file
Reviewed-on: https://gerrit.libreoffice.org/42611
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 238cfa9efa21f08514703ea6cc181ce02d8feb12)
Change-Id: I26680ecdb5f0db4f27180c221de062341af0265c
Reviewed-on: https://gerrit.libreoffice.org/42650
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/tdf112557.odp | bin | 0 -> 12749 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 14 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 11 |
3 files changed, 21 insertions, 4 deletions
diff --git a/sd/qa/unit/data/odp/tdf112557.odp b/sd/qa/unit/data/odp/tdf112557.odp Binary files differnew file mode 100755 index 000000000000..5587e7fcef82 --- /dev/null +++ b/sd/qa/unit/data/odp/tdf112557.odp diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 3300dc4efcac..c7311ef1b5ca 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -102,6 +102,7 @@ public: void testTdf59046(); void testTdf105739(); void testTdf112552(); + void testTdf112557(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest2); @@ -127,6 +128,7 @@ public: CPPUNIT_TEST(testTdf59046); CPPUNIT_TEST(testTdf105739); CPPUNIT_TEST(testTdf112552); + CPPUNIT_TEST(testTdf112557); CPPUNIT_TEST_SUITE_END(); @@ -799,6 +801,18 @@ void SdOOXMLExportTest2::testTdf112552() xDocShRef->DoClose(); } +void SdOOXMLExportTest2::testTdf112557() +{ + // Subtitle shape should be skipped by export. + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf112557.odp"), ODP); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + + xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slideMasters/slideMaster1.xml"); + assertXPath(pXmlDocContent, "/p:sldMaster/p:cSld/p:spTree/p:sp", 2); // title and object + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index cf5a37d32a48..d5b978315cf8 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -305,8 +305,11 @@ ShapeExport& PowerPointShapeExport::WriteUnknownShape( const Reference< XShape > } else if ( sShapeType == "com.sun.star.presentation.SubtitleShape" ) { - if( !WritePlaceholder( xShape, Subtitle, mbMaster ) ) - ShapeExport::WriteTextShape( xShape ); + if(mePageType != MASTER) + { + if( !WritePlaceholder( xShape, Subtitle, mbMaster ) ) + ShapeExport::WriteTextShape( xShape ); + } } return *this; @@ -1714,7 +1717,7 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr pFS->startElementNS( XML_p, XML_cSld, FSEND ); ImplWriteBackground( pFS, aXBackgroundPropSet ); - WriteShapeTree( pFS, LAYOUT, true ); + WriteShapeTree( pFS, MASTER, true ); pFS->endElementNS( XML_p, XML_cSld ); @@ -1871,7 +1874,7 @@ void PowerPointExport::WriteShapeTree( const FSHelperPtr& pFS, PageType ePageTyp ShapeExport& PowerPointShapeExport::WritePageShape( const Reference< XShape >& xShape, PageType ePageType, bool bPresObj ) { - if( ( ePageType == NOTICE && bPresObj ) || ePageType == LAYOUT ) + if( ( ePageType == NOTICE && bPresObj ) || ePageType == LAYOUT || ePageType == MASTER ) return WritePlaceholderShape( xShape, SlideImage ); return WriteTextShape( xShape ); |