[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/qa sw/source

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf123705.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx    |    4 ++++
 sw/source/filter/ww8/docxattributeoutput.cxx |    3 +++
 3 files changed, 7 insertions(+)

New commits:
commit 7b9e13376423d54cf95dfc48c9d3de0a62826943
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Feb 26 19:06:59 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Mar 4 15:07:21 2019 +0100

    tdf#123705: avoid duplicate themeColor
    
    See http://bugs.documentfoundation.org/attachment.cgi?id=149585
    + https://bugs.documentfoundation.org/show_bug.cgi?id=123705#c4
    
    Change-Id: I3c6fb0a1ac46a62c75bb9daeaded1633889416eb
    Reviewed-on: https://gerrit.libreoffice.org/68398
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 42398e3860aafd6468688eda6c0da942323b7f82)
    Reviewed-on: https://gerrit.libreoffice.org/68613
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/qa/extras/ooxmlexport/data/tdf123705.docx b/sw/qa/extras/ooxmlexport/data/tdf123705.docx
new file mode 100644
index 000000000000..46e053fd464e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123705.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index b42933eb3513..feb99c340d85 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -1013,6 +1013,10 @@ DECLARE_OOXMLEXPORT_TEST(testN830205, "n830205.docx")
     getParagraph(1, "XXX");
 }
 
+DECLARE_OOXMLEXPORT_TEST(tdf123705, "tdf123705.docx")
+{
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTableAutoColumnFixedSize, "table-auto-column-fixed-size.docx")
 {
     uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 944721571c26..78a41c64aa6e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2933,6 +2933,8 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedlineData)
                     // we are done exporting the redline attributes.
                     rtl::Reference<sax_fastparser::FastAttributeList> pFontsAttrList_Original(m_pFontsAttrList);
                     m_pFontsAttrList.clear();
+                    rtl::Reference<sax_fastparser::FastAttributeList> pColorAttrList_Original(m_pColorAttrList);
+                    m_pColorAttrList.clear();
                     rtl::Reference<sax_fastparser::FastAttributeList> pEastAsianLayoutAttrList_Original(m_pEastAsianLayoutAttrList);
                     m_pEastAsianLayoutAttrList.clear();
                     rtl::Reference<sax_fastparser::FastAttributeList> pCharLangAttrList_Original(m_pCharLangAttrList);
@@ -2946,6 +2948,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedlineData)
 
                     // Revert back the original values that were stored in 'm_pFontsAttrList', 'm_pEastAsianLayoutAttrList', 'm_pCharLangAttrList'
                     m_pFontsAttrList = pFontsAttrList_Original;
+                    m_pColorAttrList = pColorAttrList_Original;
                     m_pEastAsianLayoutAttrList = pEastAsianLayoutAttrList_Original;
                     m_pCharLangAttrList = pCharLangAttrList_Original;