Resolves: tdf#132739 two html style tags where there should be just one

0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch

@@ -0,0 +1,69 @@
+From 5d56e9f13b9c6ccad080efaea9cbc7f065b56bac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Thu, 12 Aug 2021 12:55:30 +0100
+Subject: [PATCH] Resolves: tdf#132739 two style tags where there should be
+ just one
+
+Change-Id: Id9c8c8cc8c5ffdd21ba79ff39a6279cf2ddc8025
+---
+ sw/source/filter/html/css1atr.cxx  | 4 +++-
+ sw/source/filter/html/htmltabw.cxx | 9 ++++++---
+ sw/source/filter/html/wrthtml.hxx  | 2 +-
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
+index 7b1a5cc19be3..c401d95a788f 100644
+--- a/sw/source/filter/html/css1atr.cxx
++++ b/sw/source/filter/html/css1atr.cxx
+@@ -2113,10 +2113,12 @@ void SwHTMLWriter::OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameF
+         Strm().WriteChar( '\"' );
+ }
+ 
+-void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrameFormat const& rFrameFormat)
++void SwHTMLWriter::OutCSS1_TableCellBordersAndBG(SwFrameFormat const& rFrameFormat, const SvxBrushItem *pBrushItem)
+ {
+     SwCSS1OutMode const aMode( *this,
+         CSS1_OUTMODE_STYLE_OPT_ON|CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_TABLEBOX, nullptr );
++    if (pBrushItem)
++        OutCSS1_SvxBrush(*this, *pBrushItem, Css1Background::Table, nullptr);
+     OutCSS1_SvxBox(*this, rFrameFormat.GetBox());
+     if (!m_bFirstCSS1Property)
+     {
+diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
+index 4c83319747b7..63812a9b3ef6 100644
+--- a/sw/source/filter/html/htmltabw.cxx
++++ b/sw/source/filter/html/htmltabw.cxx
+@@ -424,11 +424,14 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
+             // Avoid non-CSS version in the ReqIF case.
+             rWrt.OutBackground( pBrushItem, false );
+ 
+-        if( rWrt.m_bCfgOutStyles )
+-            OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
++        if (!rWrt.m_bCfgOutStyles)
++            pBrushItem = nullptr;
+     }
+ 
+-    rWrt.OutCSS1_TableCellBorderHack(*pBox->GetFrameFormat());
++    // tdf#132739 with rWrt.m_bCfgOutStyles of true bundle the brush item css
++    // properties into the same "style" tag as the borders so there is only one
++    // style tag
++    rWrt.OutCSS1_TableCellBordersAndBG(*pBox->GetFrameFormat(), pBrushItem);
+ 
+     sal_uInt32 nNumFormat = 0;
+     double nValue = 0.0;
+diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
+index ab282ba652ff..f82325ee50ae 100644
+--- a/sw/source/filter/html/wrthtml.hxx
++++ b/sw/source/filter/html/wrthtml.hxx
+@@ -484,7 +484,7 @@ public:
+     void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAltText, HtmlFrmOpts nFrameOpts);
+ 
+     void OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameFormat );
+-    void OutCSS1_TableCellBorderHack(const SwFrameFormat& rFrameFormat);
++    void OutCSS1_TableCellBordersAndBG(const SwFrameFormat& rFrameFormat, const SvxBrushItem *pBrushItem);
+     void OutCSS1_SectionFormatOptions( const SwFrameFormat& rFrameFormat, const SwFormatCol *pCol );
+     void OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat, HtmlFrmOpts nFrameOpts,
+                                      const SdrObject *pSdrObj=nullptr,
+-- 
+2.31.1
+

libreoffice.spec

@@ -260,6 +260,7 @@ Patch9: 0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch
 Patch10: 0001-math.desktop-include-Spreadsheet-category.patch
 Patch11: 0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch
 Patch12: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch
+Patch13: 0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch
 
 # not upstreamed
 Patch500: 0001-disable-libe-book-support.patch
@@ -2261,6 +2262,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %changelog
 * Thu Aug 12 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.5.2-5
 - replace use of ucpp with gcc cpp
+- Resolves: tdf#132739 two html style tags where there should be just one
 
 * Sat Aug 07 2021 Jonathan Wakely <jwakely@redhat.com> - 1:7.1.5.2-4
 - Rebuilt for Boost 1.76