[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/html/swhtml.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b419713f879f72dbb947ee2251a9cf586d46c3b3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 18 16:13:19 2018 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Jul 26 21:21:57 2018 +0200

    tdf#118579 ignore body in body instead of flagging as an error
    
    Change-Id: Ie6626a320a5264aea004f7c57244643798703de8
    Reviewed-on: https://gerrit.libreoffice.org/57968
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 01f15c570a30..07ea0ca88639 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1248,9 +1248,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
     switch( nToken )
     {
     case HtmlTokenId::BODY_ON:
-        if (m_bBodySeen)
-            eState = SvParserState::Error;
-        else
+        if (!m_bBodySeen)
         {
             m_bBodySeen = true;
             if( !m_aStyleSource.isEmpty() )