From a0bae88a9cd47185a71cbfd4c86bbd86ae44d30e Mon Sep 17 00:00:00 2001
From: Xisco Fauli <xiscofauli@libreoffice.org>
Date: Tue, 26 Apr 2022 00:00:18 +0200
Subject: 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>
---
 sd/qa/unit/data/pptx/tdf147586.pptx | Bin 0 -> 54643 bytes
 sd/qa/unit/export-tests-ooxml3.cxx  |  22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 sd/qa/unit/data/pptx/tdf147586.pptx

(limited to 'sd')

diff --git a/sd/qa/unit/data/pptx/tdf147586.pptx b/sd/qa/unit/data/pptx/tdf147586.pptx
new file mode 100644
index 000000000000..723facf82071
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf147586.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx
index 7a6cad3f9124..63c7ea278595 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -36,6 +36,7 @@ class SdOOXMLExportTest3 : public SdModelTestBaseXML
 public:
     void testTdf129430();
     void testTdf114848();
+    void testTdf147586();
     void testTdf68759();
     void testTdf127901();
     void testTdf48735();
@@ -118,6 +119,7 @@ public:
 
     CPPUNIT_TEST(testTdf129430);
     CPPUNIT_TEST(testTdf114848);
+    CPPUNIT_TEST(testTdf147586);
     CPPUNIT_TEST(testTdf68759);
     CPPUNIT_TEST(testTdf127901);
     CPPUNIT_TEST(testTdf48735);
@@ -231,6 +233,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
-- 
cgit