[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Thu May 23 15:16:13 UTC 2019


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

New commits:
commit f6d2125bf3511701d261b83bbfc50785b707d026
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu May 23 14:13:24 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu May 23 17:15:24 2019 +0200

    [cp] sw HTML import: ignore comments unconditionally
    
    Even on the desktop, in this branch only.
    
    Change-Id: Icc203f36ea95812aba6ccf7b3c4d37ad52a86c63
    Reviewed-on: https://gerrit.libreoffice.org/72857
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 07ea0ca88639..c052d0d55740 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -301,6 +301,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn,
     m_isInTableStructure(false),
     m_pTempViewFrame(nullptr)
 {
+    m_bIgnoreHTMLComments = true;
     m_nEventId = nullptr;
     m_bUpperSpace = m_bViewCreated = m_bChkJumpMark = false;
 


More information about the Libreoffice-commits mailing list