diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-12-17 17:44:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-18 16:52:51 +0000 |
| commit | bdce3306e84353f0d428a8ec2b74cf620ba10c63 (patch) | |
| tree | 3e5964610dd9873111b16f6ba247f9e45e11d739 | |
| parent | 1211bf4682b7e8454d86d5a812df421abf68f662 (diff) | |
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
(cherry picked from commit a923084f872b8ce13f6213827fe5b1c711e6b15f)
Reviewed-on: https://gerrit.libreoffice.org/1390
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/filter/html/htmlfly.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 9aabb328e8bd..dd55694a2aa6 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -545,7 +545,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(); @@ -822,6 +822,7 @@ rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, sRetEndTags = sOut.makeStringAndClear(); } } + assert(sRetEndTags.endsWith(rEndTags)); // fdo#58286 return sRetEndTags; } |