[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

[Michael Stahl]

 sw/source/filter/ww8/docxattributeoutput.cxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 29b783dc6844a3fed9bcf434ae3901e986b44991
Author: Michael Stahl <mstahl at 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.
    
    (cherry picked from commit 103efac8110be7e6f42fffcecc74abdcae4df7f9)
    
    Change-Id: I5030f3303bd83633fcb044573860bc8ecaacae32
    Reviewed-on: https://gerrit.libreoffice.org/34838
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index bdfaac4604fd..af9d6fd49d04 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;