summaryrefslogtreecommitdiff
path: root/writerfilter/source
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-05-03 15:09:40 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-05-03 19:29:54 +0200
commit247dabcb0b92a62b233ec0237deac84e6675325c (patch)
treef52476d6ed9ac7802ab45729542401688493e03e /writerfilter/source
parent6441eaaa5fa72946f52579426cc8847a42d94e10 (diff)
tdf#117268: treat erroneous \itap0 the same way as Word does
... so that if we are inside a table, it would not convert table paragraphs into top-level paragraphs. (The in-the-wild documents with this invalid input are, e.g., generated by Consultant+ legal reference database). Change-Id: I45eb9073a0651bc963badb84229ce5ae437f1a8c Reviewed-on: https://gerrit.libreoffice.org/53790 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'writerfilter/source')
-rw-r--r--writerfilter/source/rtftok/rtfdispatchvalue.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 27f3d9ae9de9..11fe8e6237bd 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -227,6 +227,13 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{
case RTF_ITAP:
nSprm = NS_ooxml::LN_tblDepth;
+ // tdf#117268: If \itap0 is encountered inside tables (between \cellxN and \cell), then
+ // use the default value (1), as Word apparently does
+ if (nParam == 0 && (m_nTopLevelCells != 0 || m_nNestedCells != 0))
+ {
+ nParam = 1;
+ pIntValue = std::make_shared<RTFValue>(nParam);
+ }
break;
default:
break;