diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-05-03 15:09:40 +0300 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-05-09 10:25:48 +0200 |
| commit | 6f1781cb1e0209aa2d2fcaaf4f1adbd4c36d7f54 (patch) | |
| tree | b6d7f12f273cc46a8b475dc2d8b54ec8b726164d /writerfilter | |
| parent | 97469dcb64def513ff0c655a1444589a47a9f2e3 (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).
Reviewed-on: https://gerrit.libreoffice.org/53790
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 247dabcb0b92a62b233ec0237deac84e6675325c)
Change-Id: I45eb9073a0651bc963badb84229ce5ae437f1a8c
Reviewed-on: https://gerrit.libreoffice.org/53840
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdispatchvalue.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 20379b4ef45f..3e1fd25b7b6a 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -228,6 +228,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; |