summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-11-21 14:58:40 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-11-21 21:37:17 +0100
commit122e2e0296d5060a2631867527817893f41384c4 (patch)
tree1186cc9e3d15a16d7723087c8c2eab269fc49775
parenta401651ce4f528629d5ca52557e4782bddc4a2b8 (diff)
Revert "tdf#127579 DOCX export: fix losing color of ... ODT hyperlinks"
cause ~200 asserts of https://dev-builds.libreoffice.org/crashtest/299a13e8f7307b38ac10ad351273e2559e21ab16/backtraces This reverts commit 1d81d52b5da45f26e9d3adeb3b279eb9a488b94f. Change-Id: I8d00443f2fc8c71d6ef7baed5db0072847867ce1 Reviewed-on: https://gerrit.libreoffice.org/83406 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/qa/extras/ooxmlexport/data/tdf127579.odtbin8655 -> 0 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport13.cxx9
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx6
3 files changed, 1 insertions, 14 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf127579.odt b/sw/qa/extras/ooxmlexport/data/tdf127579.odt
deleted file mode 100644
index d9277b0732d0..000000000000
--- a/sw/qa/extras/ooxmlexport/data/tdf127579.odt
+++ /dev/null
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index e59df2a5ca53..7294824b62ff 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -931,15 +931,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf127741, "tdf127741.docx")
CPPUNIT_ASSERT(visitedStyleName.equalsIgnoreAsciiCase("Visited Internet Link"));
}
-DECLARE_OOXMLEXPORT_TEST(testTdf127579, "tdf127579.odt")
-{
- xmlDocPtr pXmlDoc = parseExport("word/document.xml");
- if (!pXmlDoc)
- return;
-
- assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:hyperlink/w:r/w:rPr/w:rStyle", "val", "InternetLink");
-}
-
DECLARE_OOXMLEXPORT_TEST(testTdf127925, "tdf127925.odt")
{
xmlDocPtr pXmlStyles = parseExport("word/styles.xml");
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index f4525e09b663..00dd85bdb6cd 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -221,12 +221,8 @@ void MSWordExportBase::ExportPoolItemsToCHP( ww8::PoolItems &rItems, sal_uInt16
//properties that it rises to the top and is exported first."
//In bug 119649, it is in such situation, so we need to ignore the link style when doing ms word filter exports and
//add the second judgement for #i24291# definition.
- if (nWhich == RES_TXTATR_CHARFMT && SearchPoolItems(rItems, RES_TXTATR_INETFMT))
- {
- const SwCharFormat* pFormat = static_cast<const SwFormatCharFormat&>(*pItem).GetCharFormat();
- OutputFormat(*pFormat, false, true);
+ if ( nWhich == RES_TXTATR_INETFMT && ( rItems.begin()->second->Which() == RES_TXTATR_CHARFMT ) )
continue;
- }
// tdf#38778 Fix output of the font in DOC run for fields
if (pFont &&