summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-03-27 17:35:45 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-03-27 18:29:46 +0000
commit59af9cbbccee600408c89e872d548d153523ab1f (patch)
tree66323e79644cb3dcdc03e73876078c0ec7f8c66e /sw/source/filter
parent3632df3df311ec709e86544329cd0a8a87614c70 (diff)
tdf#106799 WW8: Accept TTP Mark without Cell Mark
Paragraph mark of inner table (0x0D) sometimes has sprmPFInnerTtp, but no sprmPFInnerTableCell. This still counts as cell end (at least, MS Word treats it that way). Unit test included. Change-Id: I5589cdd486c03ca4567d61882826cc7c245a40c9 Reviewed-on: https://gerrit.libreoffice.org/35763 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ww8/ww8par.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 3bd36395c5e4..908dcd0f7b71 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3673,7 +3673,9 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
bParaMark = false;
}
}
- else if (m_bWasTabCellEnd)
+ // tdf#106799: We expect TTP marks to be also cell marks,
+ // but sometimes sprmPFInnerTtp comes without sprmPFInnerTableCell
+ else if (m_bWasTabCellEnd || m_bWasTabRowEnd)
{
TabCellEnd();
bParaMark = false;