[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/filter/html/htmltab.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 39ebbed8a191293f8ec92f4bd254c28bd9807702
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 1 17:27:53 2018 +0000

    ofz#5718 Direct-leak
    
    revert
    
    commit ed8dd7f47793b8ef3cc76ce4cde4d7348b51baad
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Wed Dec 13 20:22:11 2017 +0000
    
        ofz: skip tables when parser is invalid
    
    Change-Id: Icf90f53795f6b01678c760771aec34acd93dbe3e
    Reviewed-on: https://gerrit.libreoffice.org/49113
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index b26a03d02ce1..b1b273ddc531 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -5131,7 +5131,7 @@ std::shared_ptr<HTMLTable> SwHTMLParser::BuildTable(SvxAdjust eParentAdjust,
         m_nContextStMin = pTCntxt->GetContextStMin();
         m_nContextStAttrMin = pTCntxt->GetContextStAttrMin();
 
-        if (m_xTable == xCurTable && eState != SvParserState::Error)
+        if (m_xTable == xCurTable)
         {
             // Set table caption
             const SwStartNode *pCapStNd = m_xTable->GetCaptionStartNode();
@@ -5190,7 +5190,7 @@ std::shared_ptr<HTMLTable> SwHTMLParser::BuildTable(SvxAdjust eParentAdjust,
         pTCntxt->RestorePREListingXMP( *this );
         RestoreAttrTab(pTCntxt->xAttrTab);
 
-        if (m_xTable == xCurTable && eState != SvParserState::Error)
+        if (m_xTable == xCurTable)
         {
             // Set upper paragraph spacing
             m_bUpperSpace = true;