Kaydet (Commit) 1870ed0e authored tarafından Ravindra Vidhate's avatar Ravindra Vidhate Kaydeden (comit) Miklos Vajna

fdo#78659:FIle geting corrupted after Roundtrip due to fieldchar.

In a hyperlink, the field with fieldchartype="end" is getting addeded eventhough there is no begin for that field.

Change-Id: I50df6efc63fc9a66b146d4a861ae4bd654b4a3c6
Reviewed-on: https://gerrit.libreoffice.org/9368Tested-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 76531b80
...@@ -3362,6 +3362,15 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78284, "fdo78284.docx") ...@@ -3362,6 +3362,15 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78284, "fdo78284.docx")
"image/png"); "image/png");
} }
DECLARE_OOXMLEXPORT_TEST(testFDO78659, "fdo78659.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
if (!pXmlDoc)
return;
assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:tbl[8]/w:tr[6]/w:tc[1]/w:p[1]/w:hyperlink[1]/w:r[3]/w:fldChar[1]", 0);
}
DECLARE_OOXMLEXPORT_TEST(testFDO78384,"fdo78384.docx") DECLARE_OOXMLEXPORT_TEST(testFDO78384,"fdo78384.docx")
{ {
xmlDocPtr pXmlDoc = parseExport("word/document.xml"); xmlDocPtr pXmlDoc = parseExport("word/document.xml");
......
...@@ -1866,7 +1866,7 @@ bool DocxAttributeOutput::StartURL( const OUString& rUrl, const OUString& rTarge ...@@ -1866,7 +1866,7 @@ bool DocxAttributeOutput::StartURL( const OUString& rUrl, const OUString& rTarge
bool DocxAttributeOutput::EndURL() bool DocxAttributeOutput::EndURL()
{ {
m_closeHyperlinkInThisRun = true; m_closeHyperlinkInThisRun = true;
if(m_hyperLinkAnchor != "" && m_hyperLinkAnchor.startsWith("_Toc")) if(m_startedHyperlink && m_hyperLinkAnchor != "" && m_hyperLinkAnchor.startsWith("_Toc"))
{ {
m_endPageRef = true; m_endPageRef = true;
} }
......
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