Kaydet (Commit) 7b9e1337 authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Miklos Vajna

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/68398Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 42398e38)
Reviewed-on: https://gerrit.libreoffice.org/68613
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst 41fd47ee
...@@ -1013,6 +1013,10 @@ DECLARE_OOXMLEXPORT_TEST(testN830205, "n830205.docx") ...@@ -1013,6 +1013,10 @@ DECLARE_OOXMLEXPORT_TEST(testN830205, "n830205.docx")
getParagraph(1, "XXX"); getParagraph(1, "XXX");
} }
DECLARE_OOXMLEXPORT_TEST(tdf123705, "tdf123705.docx")
{
}
DECLARE_OOXMLEXPORT_TEST(testTableAutoColumnFixedSize, "table-auto-column-fixed-size.docx") DECLARE_OOXMLEXPORT_TEST(testTableAutoColumnFixedSize, "table-auto-column-fixed-size.docx")
{ {
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
......
...@@ -2933,6 +2933,8 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedlineData) ...@@ -2933,6 +2933,8 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedlineData)
// we are done exporting the redline attributes. // we are done exporting the redline attributes.
rtl::Reference<sax_fastparser::FastAttributeList> pFontsAttrList_Original(m_pFontsAttrList); rtl::Reference<sax_fastparser::FastAttributeList> pFontsAttrList_Original(m_pFontsAttrList);
m_pFontsAttrList.clear(); m_pFontsAttrList.clear();
rtl::Reference<sax_fastparser::FastAttributeList> pColorAttrList_Original(m_pColorAttrList);
m_pColorAttrList.clear();
rtl::Reference<sax_fastparser::FastAttributeList> pEastAsianLayoutAttrList_Original(m_pEastAsianLayoutAttrList); rtl::Reference<sax_fastparser::FastAttributeList> pEastAsianLayoutAttrList_Original(m_pEastAsianLayoutAttrList);
m_pEastAsianLayoutAttrList.clear(); m_pEastAsianLayoutAttrList.clear();
rtl::Reference<sax_fastparser::FastAttributeList> pCharLangAttrList_Original(m_pCharLangAttrList); rtl::Reference<sax_fastparser::FastAttributeList> pCharLangAttrList_Original(m_pCharLangAttrList);
...@@ -2946,6 +2948,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedlineData) ...@@ -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' // Revert back the original values that were stored in 'm_pFontsAttrList', 'm_pEastAsianLayoutAttrList', 'm_pCharLangAttrList'
m_pFontsAttrList = pFontsAttrList_Original; m_pFontsAttrList = pFontsAttrList_Original;
m_pColorAttrList = pColorAttrList_Original;
m_pEastAsianLayoutAttrList = pEastAsianLayoutAttrList_Original; m_pEastAsianLayoutAttrList = pEastAsianLayoutAttrList_Original;
m_pCharLangAttrList = pCharLangAttrList_Original; m_pCharLangAttrList = pCharLangAttrList_Original;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment