diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-03-02 23:11:29 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-07 16:03:51 +0000 |
| commit | 69b89daa2c583d02da0eb04f9a388d86d87f6ed5 (patch) | |
| tree | 5e055220151320414c751d1762cce55d5288e313 | |
| parent | c713f227cc34b841c06beca2e9eaa96653eac372 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1673f7403f2e..36872e7bc19f 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; |