diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-04-26 00:00:18 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2022-04-26 17:42:48 +0200 |
| commit | 74a42203fc1f90726cf1219139df5c00e6978914 (patch) | |
| tree | c50e8ddbea2c46dac28ea2539e6e3582a6105e44 | |
| parent | 537b2616b9c8639b2f1108047f39693ac6bd5500 (diff) | |
tdf#147586: Initialize mbBulletColorFollowText to false
Otherwise, once it's set to true, it's never reset
Change-Id: Ie8a752da4162775f40c2f84f480e6a103eb55942
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133422
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit a0bae88a9cd47185a71cbfd4c86bbd86ae44d30e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133404
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | oox/source/drawingml/textparagraphproperties.cxx | 3 | ||||
| -rw-r--r-- | sd/qa/unit/data/pptx/tdf147586.pptx | bin | 0 -> 54643 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml3.cxx | 22 |
3 files changed, 24 insertions, 1 deletions
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 70f1ac0c937b..07624e83d1fa 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -57,7 +57,8 @@ using ::com::sun::star::awt::FontDescriptor; namespace oox::drawingml { BulletList::BulletList( ) -: maBulletColorPtr( std::make_shared<Color>() ) +: maBulletColorPtr( std::make_shared<Color>() ), + mbBulletColorFollowText ( false ) { } diff --git a/sd/qa/unit/data/pptx/tdf147586.pptx b/sd/qa/unit/data/pptx/tdf147586.pptx Binary files differnew file mode 100644 index 000000000000..723facf82071 --- /dev/null +++ b/sd/qa/unit/data/pptx/tdf147586.pptx diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx index 96642cdc73ec..84366e1be9f3 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -55,6 +55,7 @@ class SdOOXMLExportTest3 : public SdModelTestBaseXML public: void testTdf129430(); void testTdf114848(); + void testTdf147586(); void testTdf68759(); void testTdf127901(); void testTdf48735(); @@ -135,6 +136,7 @@ public: CPPUNIT_TEST(testTdf129430); CPPUNIT_TEST(testTdf114848); + CPPUNIT_TEST(testTdf147586); CPPUNIT_TEST(testTdf68759); CPPUNIT_TEST(testTdf127901); CPPUNIT_TEST(testTdf48735); @@ -246,6 +248,26 @@ void SdOOXMLExportTest3::testTdf114848() "1f497d"); } +void SdOOXMLExportTest3::testTdf147586() +{ + ::sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf147586.pptx"), PPTX); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + xDocShRef->DoClose(); + + xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); + // Without the fix in place, this test would have failed with + // - Expected: 227fc7 + // - Actual : 4f4f4f + assertXPath(pXmlDocContent, + "/p:sld/p:cSld/p:spTree/p:sp[1]/p:txBody/a:p[1]/a:pPr/a:buClr/a:srgbClr", "val", + "227fc7"); + assertXPath(pXmlDocContent, + "/p:sld/p:cSld/p:spTree/p:sp[1]/p:txBody/a:p[2]/a:pPr/a:buClr/a:srgbClr", "val", + "227fc7"); +} + void SdOOXMLExportTest3::testTdf68759() { ::sd::DrawDocShellRef xDocShRef |