diff options
| author | Attila Bakos (NISZ) <bakos.attilakaroly@nisz.hu> | 2021-12-08 10:22:37 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-12-09 15:25:48 +0100 |
| commit | 97ce03ccf1287c1fa79d5741a85fa419e03d9a35 (patch) | |
| tree | 7fdda38d9716ea9974974be602e6ff5313f7e116 /sd/qa | |
| parent | b5eecfc708316c1d5603f5235b408ce9fc19156d (diff) | |
tdf#145162 PPTX export: fix extra bullet regression
Placeholders have bullet by default in MSO, so
write <a:buNone/> for paragraphs where numbering/bullet
is disabled to avoid extra bullets in Impress.
Regression from commit b6b02e0b4c9d739836e1f61a886ea45b01e6696e
(tdf#111903 tdf#137152 PPTX export: fix placeholders).
Change-Id: Ib4c563cba475d61bc475ca05623e7c7b20fded30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126528
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit f57cfddb51b7d7409b7b425dc200aa73406a13bd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126524
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/data/pptx/tdf145162.pptx | bin | 0 -> 33770 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml3.cxx | 16 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/tdf145162.pptx b/sd/qa/unit/data/pptx/tdf145162.pptx Binary files differnew file mode 100644 index 000000000000..3746740f327c --- /dev/null +++ b/sd/qa/unit/data/pptx/tdf145162.pptx diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx index 900716e20093..fbf39e111f71 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -70,6 +70,7 @@ public: void testTdf118806(); void testTdf130058(); void testTdf111789(); + void testTdf145162(); void testTdf100348_convert_Fontwork2TextWarp(); void testTdf1225573_FontWorkScaleX(); void testTdf99497_keepAppearanceOfCircleKind(); @@ -143,6 +144,7 @@ public: CPPUNIT_TEST(testTdf118806); CPPUNIT_TEST(testTdf130058); CPPUNIT_TEST(testTdf111789); + CPPUNIT_TEST(testTdf145162); CPPUNIT_TEST(testTdf100348_convert_Fontwork2TextWarp); CPPUNIT_TEST(testTdf1225573_FontWorkScaleX); CPPUNIT_TEST(testTdf99497_keepAppearanceOfCircleKind); @@ -612,6 +614,20 @@ void SdOOXMLExportTest3::testTdf111789() xDocShRef->DoClose(); } +void SdOOXMLExportTest3::testTdf145162() +{ + sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf145162.pptx"), PPTX); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); + + assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[2]/p:txBody/a:p[2]/a:pPr/a:buNone"); + // Before the fix, that tag was missing so PP put bullet to each para. + + xDocShRef->DoClose(); +} + void SdOOXMLExportTest3::testTdf100348_convert_Fontwork2TextWarp() { ::sd::DrawDocShellRef xDocShRef = loadURL( |