[Libreoffice-commits] .: sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 17 14:11:19 PST 2012
sw/source/filter/html/htmlfly.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a923084f872b8ce13f6213827fe5b1c711e6b15f
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Dec 17 17:44:22 2012 +0100
fdo#58286: sw HTML export: fix missing end tags on FrmFmts
SwHTMLWriter::OutFrmFmtOptions must return a value that includes the
parameter rEndTags.
(regression from 3852a6f54880af8ed9161227baa555580c7d4517)
Change-Id: I280a0de57e254f75b69d08d93e23bf7c765058ec
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index cdf6292..f9761aa 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -534,7 +534,7 @@ rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
sal_uInt32 nFrmOpts,
const rtl::OString &rEndTags )
{
- rtl::OString sRetEndTags;
+ rtl::OString sRetEndTags(rEndTags);
rtl::OStringBuffer sOut;
const SfxPoolItem* pItem;
const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
@@ -811,6 +811,7 @@ rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
sRetEndTags = sOut.makeStringAndClear();
}
}
+ assert(sRetEndTags.endsWith(rEndTags)); // fdo#58286
return sRetEndTags;
}
More information about the Libreoffice-commits
mailing list