sw/qa/extras/ooxmlexport/data/tdf107111.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 13 +++++++++++++
sw/source/filter/ww8/ww8atr.cxx | 1 +
3 files changed, 14 insertions(+)
New commits:
commit a4713560e3b4b7dc3d72e3811e41ff9c4feda24a
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
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.
Reviewed-on: https://gerrit.libreoffice.org/43310
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
Change-Id: I4ba5ce1f70e05d706d17d60e1a33a62995701f9e
Reviewed-on: https://gerrit.libreoffice.org/44754
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Serge Krot (CIB) <serge.k...@cib.de>
Tested-by: Serge Krot (CIB) <serge.k...@cib.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
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/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index b184c116232a..f67a2b37888f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -684,6 +684,19 @@ DECLARE_OOXMLEXPORT_TEST(testWatermark,
"watermark-shapetype.docx")
CPPUNIT_ASSERT_EQUAL(xPropertySet1->getPropertyValue("TextAutoGrowHeight"),
xPropertySet2->getPropertyValue("TextAutoGrowHeight"));
}
+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);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index cad3bdb73020..a6cc9dc3bbaa 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2280,6 +2280,7 @@ void AttributeOutputBase::EndTOX( const SwSection&
rSect,bool bCareEnd )
}
}
GetExport( ).m_bInWriteTOX = false;
+ GetExport( ).m_bHideTabLeaderAndPageNumbers = false;
if (bCareEnd)
OnTOXEnding();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
