summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2018-01-18 17:31:22 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-01-23 09:56:50 +0100
commitee1ff57f901b976a1be12c57c800ca78a8427b81 (patch)
treed3d92e480f1f3a81a972b6c83793dbf664307d8a /sw
parent88704209e5e97230af626732a657a720fee516af (diff)
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@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/html/htmlctxt.cxx1
1 files changed, 1 insertions, 0 deletions
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) ||