[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 2 commits - sd/qa sd/source

[Szymon Kłos]

 sd/qa/unit/data/pptx/tdf112334.pptx      |binary
 sd/qa/unit/export-tests-ooxml2.cxx       |   15 +++++++++++++++
 sd/source/filter/eppt/pptx-epptooxml.cxx |    6 ++++++
 3 files changed, 21 insertions(+)

New commits:
commit 49ddb653f1591881880a0331eca6d71ae17477bb
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Fri Sep 22 11:13:07 2017 +0200

    tdf#112334 unit test
    
    Reviewed-on: https://gerrit.libreoffice.org/42628
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit f10d5eb1435952052447fcb09dc1ece25202a48a)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>
    
    Change-Id: Ie041595ba604d4563d7ff356eee18ff3e50fef41

diff --git a/sd/qa/unit/data/pptx/tdf112334.pptx b/sd/qa/unit/data/pptx/tdf112334.pptx
new file mode 100755
index 000000000000..1e57d41caaef
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf112334.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 7ed12af08b67..f47e30cd74cd 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -112,6 +112,7 @@ public:
     void testTdf112088();
     void testTdf112333();
     void testTdf112089();
+    void testTdf112334();
 
     CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -147,6 +148,7 @@ public:
     CPPUNIT_TEST(testTdf112088);
     CPPUNIT_TEST(testTdf112333);
     CPPUNIT_TEST(testTdf112089);
+    CPPUNIT_TEST(testTdf112334);
 
     CPPUNIT_TEST_SUITE_END();
 
@@ -946,6 +948,19 @@ void SdOOXMLExportTest2::testTdf112089()
     CPPUNIT_ASSERT_EQUAL(sID, sTarget);
 }
 
+void SdOOXMLExportTest2::testTdf112334()
+{
+    ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112334.pptx"), PPTX);
+    utl::TempFile tempFile;
+    xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+    xDocShRef->DoClose();
+
+    xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+
+    OUString sAttributeName = getXPathContent(pXmlDocContent, "/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animClr[1]/p:cBhvr/p:attrNameLst/p:attrName");
+    CPPUNIT_ASSERT_EQUAL(OUString("style.color"), sAttributeName);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 4e9ffa01d99ec5a67468658641500cc317292092
Author: lbenes <lukebenes at hotmail.com>
Date:   Fri Sep 22 00:45:25 2017 -0400

    tdf#112334 PPTX export style.color
    
    Change-Id: I6a5779cee379b82d81cc73a0d0c154e6caa51424
    Reviewed-on: https://gerrit.libreoffice.org/42613
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 9bcf000b49252a2293d05135a1a3d62bca5a5dc8)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index f0e1b27f46b0..394ed1b4eb15 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -956,6 +956,12 @@ void PowerPointExport::WriteAnimationAttributeName( const FSHelperPtr& pFS, cons
         pFS->writeEscaped("fillcolor");
         pFS->endElementNS(XML_p, XML_attrName);
     }
+    else if (rAttributeName == "CharColor")
+    {
+        pFS->startElementNS(XML_p, XML_attrName, FSEND);
+        pFS->writeEscaped("style.color");
+        pFS->endElementNS(XML_p, XML_attrName);
+    }
     else
     {
         SAL_INFO("sd.eppt", "unhandled animation attribute name: " << rAttributeName);