summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/html/htmlatr.cxx17
-rw-r--r--sw/source/filter/html/htmlnumwriter.cxx14
2 files changed, 15 insertions, 16 deletions
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 9bee7fc22157..fa70b2767f09 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -207,7 +207,6 @@ struct SwHTMLTextCollOutputInfo
bool bParaPossible; // a </P> may be output additionally
bool bOutPara; // a </P> is supposed to be output
bool bOutDiv; // write a </DIV>
- bool bOutLi = false; // write a </li>
SwHTMLTextCollOutputInfo() :
bInNumberBulletList( false ),
@@ -764,14 +763,8 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
html.start(OOO_STRING_SVTOOLS_HTML_li);
if( USHRT_MAX != nNumStart )
html.attribute(OOO_STRING_SVTOOLS_HTML_O_value, OString::number(nNumStart));
- if (rHWrt.mbXHTML)
- {
- rWrt.Strm().WriteCharPtr(">");
- rInfo.bOutLi = true;
- }
- else
- // Finish the opening element, but don't close it.
- html.characters(OString());
+ // Finish the opening element, but don't close it.
+ html.characters(OString());
}
if( rHWrt.m_nDefListLvl > 0 && !bForceDL )
@@ -1022,11 +1015,7 @@ static void OutHTML_SwFormatOff( Writer& rWrt, const SwHTMLTextCollOutputInfo& r
rHWrt.m_bLFPossible = true;
}
- if (rInfo.bOutLi)
- HTMLOutFuncs::Out_AsciiTag(rWrt.Strm(), rHWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_li,
- false);
-
- // if necessary, close a bulleted or numbered list
+ // if necessary, close the list item, then close a bulleted or numbered list
if( rInfo.bInNumberBulletList )
{
rHWrt.FillNextNumInfo();
diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx
index 8977e0dbf684..ea3c949c3801 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -279,8 +279,18 @@ Writer& OutHTML_NumberBulletListEnd( SwHTMLWriter& rWrt,
{
SwHTMLNumRuleInfo& rInfo = rWrt.GetNumInfo();
bool bSameRule = rNextInfo.GetNumRule() == rInfo.GetNumRule();
- if( bSameRule && rNextInfo.GetDepth() >= rInfo.GetDepth() &&
- !rNextInfo.IsRestart() )
+ bool bListEnd = !bSameRule || rNextInfo.GetDepth() < rInfo.GetDepth() || rNextInfo.IsRestart();
+
+ if (rWrt.mbXHTML)
+ {
+ if (bListEnd || (!bListEnd && rNextInfo.IsNumbered()))
+ {
+ HTMLOutFuncs::Out_AsciiTag(rWrt.Strm(),
+ rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_li, false);
+ }
+ }
+
+ if (!bListEnd)
{
return rWrt;
}