sw/qa/extras/ooxmlexport/data/tdf107111.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 13 +++++++++++++ sw/source/filter/ww8/ww8atr.cxx | 1 + 3 files changed, 14 insertions(+)
New commits: commit e0558f967aa39dbf8162f4b7589e238e9a0ae7c4 Author: Vasily Melenchuk <[email protected]> Date: Tue Oct 10 16:42:38 2017 +0300 tdf#107111: DOCX export: restore HideTabLeader... attribute after TOX Previously m_bHideTabLeaderAndPageNumbers value was not restored after TOX finish and so causing visibility problems with following hyperlinks. Change-Id: I4ba5ce1f70e05d706d17d60e1a33a62995701f9e Reviewed-on: https://gerrit.libreoffice.org/43310 Tested-by: Jenkins <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport9.cxx diff --git a/sw/qa/extras/ooxmlexport/data/tdf107111.docx b/sw/qa/extras/ooxmlexport/data/tdf107111.docx new file mode 100644 index 000000000000..f89436fda754 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf107111.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index 4283909df1cf..b82b39e7c34c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -1230,6 +1230,19 @@ DECLARE_OOXMLEXPORT_TEST(testTdf90789_2, "tdf90789-2.docx") CPPUNIT_ASSERT_EQUAL( 3, getPages() ); } +DECLARE_OOXMLEXPORT_TEST(testTdf107111, "tdf107111.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + + // Ensure that hyperlink and its properties are in place. + assertXPath(pXmlDoc, "/w:document/w:body/w:p[5]/w:hyperlink/w:r/w:rPr", 1); + + // Ensure that hyperlink properties do not contain <w:webHidden/>. + assertXPath(pXmlDoc, "/w:document/w:body/w:p[5]/w:hyperlink/w:r/w:rPr/w:webHidden", 0); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index fb6b552d26ed..9df4a6a7bf13 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2286,6 +2286,7 @@ void AttributeOutputBase::EndTOX( const SwSection& rSect,bool bCareEnd ) } } GetExport( ).m_bInWriteTOX = false; + GetExport( ).m_bHideTabLeaderAndPageNumbers = false; if (bCareEnd) OnTOXEnding(); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
