diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-03-02 16:15:16 +0300 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2023-03-12 18:09:57 +0100 |
commit | c775650ba70992d3b525e60fb444d64f742e7f5b (patch) | |
tree | 524fd6a9f01d1ec5f93c5025cf17eacbf2eff2cc /sw/source/filter/html | |
parent | 2830090b89ac76fd1615b62296490a69abe9245c (diff) |
tdf#153923: close 'dd' tag properly
Change-Id: I4ae3b23c616fc2ea40a5fdf8640bf5db0bb371ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148122
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 74cd34d54d16cb68fbaf1e8cb9844b1048491965)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148097
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/source/filter/html')
-rw-r--r-- | sw/source/filter/html/htmltabw.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index a1dee0f75333..fec5e4a10e31 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -1057,6 +1057,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode, if( rHTMLWrt.m_bLFPossible ) rHTMLWrt.OutNewLine(); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), Concat2View(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_dd) ); + rHTMLWrt.IncIndentLevel(); } // eFlyHoriOri and eTabHoriOri now only contain the values of @@ -1183,6 +1184,15 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode, // move Pam behind the table rHTMLWrt.m_pCurrentPam->GetPoint()->Assign( *rNode.EndOfSectionNode() ); + if (nNewDefListLvl) + { + rHTMLWrt.DecIndentLevel(); + if (rHTMLWrt.m_bLFPossible) + rHTMLWrt.OutNewLine(); + // close the dd element + HTMLOutFuncs::Out_AsciiTag(rWrt.Strm(), Concat2View(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_dd), false); + } + if( bPreserveForm ) { rHTMLWrt.m_bPreserveForm = false; |