diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-04-11 21:24:58 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-05-13 20:05:18 +0200 |
| commit | 111160238f2bb3a882331a2e91e88235fadd4fed (patch) | |
| tree | 690518af7dea74a6151dde76aa54c53fdc16a689 /sw/source/filter | |
| parent | 6c7bc5b4315a6e3718bcccab89fb8dfee2eeaf5d (diff) | |
tdf#154761: each dl needs a dd to actually indent
Change-Id: Iaa75048b33ab82250d205cbf821e57425754ef5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150244
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150491
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltabw.cxx | 19 | ||||
| -rw-r--r-- | sw/source/filter/html/wrthtml.hxx | 1 |
3 files changed, 4 insertions, 18 deletions
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 6584e8a0e279..dae347aab98e 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -136,6 +136,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl ) if( m_bLFPossible ) OutNewLine(); HTMLOutFuncs::Out_AsciiTag( Strm(), Concat2View(GetNamespace() + OOO_STRING_SVTOOLS_HTML_deflist) ); + HTMLOutFuncs::Out_AsciiTag( Strm(), Concat2View(GetNamespace() + OOO_STRING_SVTOOLS_HTML_dd) ); IncIndentLevel(); m_bLFPossible = true; } @@ -147,6 +148,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl ) DecIndentLevel(); if( m_bLFPossible ) OutNewLine(); + HTMLOutFuncs::Out_AsciiTag( Strm(), Concat2View(GetNamespace() + OOO_STRING_SVTOOLS_HTML_dd), false ); HTMLOutFuncs::Out_AsciiTag( Strm(), Concat2View(GetNamespace() + OOO_STRING_SVTOOLS_HTML_deflist), false ); m_bLFPossible = true; } diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 8c86f70c97ff..ab611724474d 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -1050,17 +1050,9 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode, } } - if( !pFlyFrameFormat && nNewDefListLvl != rHTMLWrt.m_nDefListLvl ) + if( !pFlyFrameFormat && !rHTMLWrt.mbReqIF && nNewDefListLvl != rHTMLWrt.m_nDefListLvl ) rHTMLWrt.OutAndSetDefList( nNewDefListLvl ); - if( nNewDefListLvl ) - { - 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 // LEFT/CENTER and RIGHT! if( eFlyHoriOri!=text::HoriOrientation::NONE ) @@ -1185,15 +1177,6 @@ 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; diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 8f4073a5b6dd..a1986daf5dba 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -473,6 +473,7 @@ public: void OutBasic(const SwHTMLWriter& rHTMLWrt); + // Used to indent inner blocks using dl/dd tags void OutAndSetDefList( sal_uInt16 nNewLvl ); void OutStyleSheet( const SwPageDesc& rPageDesc ); |