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

[Michael Stahl]

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

New commits:
commit aac8f29ee75607882386f88ab22e4df657bf619b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 18 17:31:22 2018 +0100

    ofz#4754 sw: HTML import: fix invalid tables being created
    
    This 75-byte horror creates 2 nested tables, where one SwTableBox is in
    the SwTableLine of the inner SwTable but in the SwSortBoxes of the outer
    table, which is of course invalid.
    
    The root cause is that in SwHTMLParser::SplitAttrTab(), we move the
    m_pPam backward once and forward twice, moving it ouside the inner
    table.
    
    Change-Id: I63f6508afe1270ccdeb05da6f222b0aba5259889
    (cherry picked from commit e1a4a8c180f98aac0ab21a22a6a03d2109c712be)
    Reviewed-on: https://gerrit.libreoffice.org/48145
    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>
    (cherry picked from commit ee1ff57f901b976a1be12c57c800ca78a8427b81)
    Reviewed-on: https://gerrit.libreoffice.org/48379
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index f93e5ffee1d0..e501ca63d00f 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -163,6 +163,7 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
             {
                 m_pPam->Move( fnMoveForward );
                 nOldEndCnt = m_pPam->GetPoint()->nContent.GetIndex();
+                bMoveBack = false;
             }
 
             if( (RES_PARATR_BEGIN <= nWhich && bMoveBack) ||