From a1e44657ef62488076b0f4cfd271d0a73cbff7d3 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 26 Feb 2019 19:06:59 +0100 Subject: 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 (cherry picked from commit 42398e3860aafd6468688eda6c0da942323b7f82) Reviewed-on: https://gerrit.libreoffice.org/68614 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- sw/qa/extras/ooxmlexport/data/tdf123705.docx | Bin 0 -> 49292 bytes sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 4 ++++ sw/source/filter/ww8/docxattributeoutput.cxx | 3 +++ 3 files changed, 7 insertions(+) create mode 100644 sw/qa/extras/ooxmlexport/data/tdf123705.docx 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 66e2228fb368..34a95b685d89 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx @@ -992,6 +992,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 xTablesSupplier(mxComponent, uno::UNO_QUERY); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index e332bee8d747..366670f86974 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2753,6 +2753,8 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedlineData) // we are done exporting the redline attributes. rtl::Reference pFontsAttrList_Original(m_pFontsAttrList); m_pFontsAttrList.clear(); + rtl::Reference pColorAttrList_Original(m_pColorAttrList); + m_pColorAttrList.clear(); rtl::Reference pEastAsianLayoutAttrList_Original(m_pEastAsianLayoutAttrList); m_pEastAsianLayoutAttrList.clear(); rtl::Reference pCharLangAttrList_Original(m_pCharLangAttrList); @@ -2766,6 +2768,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; -- cgit