sw/source/filter/ww8/docxattributeoutput.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
New commits: commit 69b89daa2c583d02da0eb04f9a388d86d87f6ed5 Author: Michael Stahl <mst...@redhat.com> Date: Thu Mar 2 23:11:29 2017 +0100 tdf#101178 sw: DOCX export: fix crash These conditions in DocxAttributeOutput::EndRun() are apparently not mutually exclusive, so don't increment m_nFieldsInHyperlink twice. Whether the m_nFieldsInHyperlink makes any sense considering there are *2* hyperlinks then, i can't tell. Change-Id: I5030f3303bd83633fcb044573860bc8ecaacae32 (cherry picked from commit 103efac8110be7e6f42fffcecc74abdcae4df7f9) Reviewed-on: https://gerrit.libreoffice.org/34837 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1673f74..36872e7 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1141,12 +1141,9 @@ void DocxAttributeOutput::EndRun() continue; } - if (m_startedHyperlink) - ++m_nFieldsInHyperlink; - - if ( m_pHyperlinkAttrList.is() ) + if (m_startedHyperlink || m_pHyperlinkAttrList.is()) { - m_nFieldsInHyperlink++; + ++m_nFieldsInHyperlink; } } ++pIt; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits