summaryrefslogtreecommitdiffstats
path: root/sw/source/ui/envelp/envfmt.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2022-10-25 15:55:34 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2022-10-26 08:43:52 +0200
commitf3e629ff15dcf2710901dbb942cee9b3c4e38af3 (patch)
tree2b9993a9988029fcefeb55934b156e97ed1e33f9 /sw/source/ui/envelp/envfmt.cxx
parenttdf#151060 sw PDF export: don't paint off-page part of drawing object (diff)
downloadcore-f3e629ff15dcf2710901dbb942cee9b3c4e38af3.tar.gz
core-f3e629ff15dcf2710901dbb942cee9b3c4e38af3.zip
sw html import: fix handling of CDATA
In case the HTML contained markup like <![CDATA[...]]>, we simply ignored it during import, even if e.g. the ODT import handles that correctly. The reason for this is that the svtools/ HTMLParser had code to parse <!-- ... ---> style comments, but not for CDATA. Fix the problem by introducing a new HtmlTokenId::CDATA, producing a matching token content in HTMLParser::GetNextToken_(), and finally map it to normal text on the Writer side. Note that HtmlTokenId doesn't allow non-on-off tokens past ONOFF_START, neither allows inserting a single token before ONOFF_START (it breaks getOnToken()), so for now just add a second, dummy token to avoid breakage. Change-Id: I605c3c21dc11986fda5d93d36148788a638e97b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141813 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit b38730ae0ae92ca49b84a45853c2ed098ee9064f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141838 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw/source/ui/envelp/envfmt.cxx')
0 files changed, 0 insertions, 0 deletions