[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/html/htmlfly.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bdce3306e84353f0d428a8ec2b74cf620ba10c63
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
    (cherry picked from commit a923084f872b8ce13f6213827fe5b1c711e6b15f)
    Reviewed-on: https://gerrit.libreoffice.org/1390
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 9aabb32..dd55694 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;
 }