[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/source

[Henry Castro (via logerrit)]

 sc/source/filter/html/htmlexp.cxx |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 147327051c9d684be4539d490126aa55382421a6
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Thu May 11 16:29:55 2023 -0400
Commit:     Henry Castro <hcas...@collabora.com>
CommitDate: Mon May 15 13:31:16 2023 +0200

    sc: filter: html: fix missing color scale conditional format
    
    When copying a range cell to an external application that request
    html data, the color scale conditional format does not have an
    associate a set attribute.
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: I82b466a2100abc5070e92f844dc706d9b015c2e1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151687
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sc/source/filter/html/htmlexp.cxx 
b/sc/source/filter/html/htmlexp.cxx
index 2007613840e0..fe93eb3c752a 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -64,6 +64,8 @@
 #include <editutil.hxx>
 #include <ftools.hxx>
 #include <cellvalue.hxx>
+#include <conditio.hxx>
+#include <colorscale.hxx>
 #include <mtvelements.hxx>
 
 #include <editeng/flditem.hxx>
@@ -881,10 +883,27 @@ void ScHTMLExport::WriteTables()
 
 void ScHTMLExport::WriteCell( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol, 
SCROW nRow, SCTAB nTab )
 {
+    std::optional<Color> aColorScale;
     ScAddress aPos( nCol, nRow, nTab );
     ScRefCellValue aCell(*pDoc, aPos, rBlockPos);
     const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab );
     const SfxItemSet* pCondItemSet = pDoc->GetCondResult( nCol, nRow, nTab, 
&aCell );
+    if (!pCondItemSet)
+    {
+        ScConditionalFormatList* pCondList = pDoc->GetCondFormList(nTab);
+        const ScCondFormatItem& rCondItem = pAttr->GetItem(ATTR_CONDITIONAL);
+        const ScCondFormatIndexes& rCondIndex = rCondItem.GetCondFormatData();
+        if (rCondIndex.size() > 0)
+        {
+            ScConditionalFormat* pCondFmt = 
pCondList->GetFormat(rCondIndex[0]);
+            if (pCondFmt)
+            {
+                const ScColorScaleFormat* pEntry = dynamic_cast<const 
ScColorScaleFormat*>(pCondFmt->GetEntry(0));
+                if (pEntry)
+                    aColorScale = pEntry->GetColor(aPos);
+            }
+        }
+    }
 
     const ScMergeFlagAttr& rMergeFlagAttr = pAttr->GetItem( ATTR_MERGE_FLAG, 
pCondItemSet );
     if ( rMergeFlagAttr.IsOverlapped() )
@@ -1023,7 +1042,9 @@ void ScHTMLExport::WriteCell( sc::ColumnBlockPosition& 
rBlockPos, SCCOL nCol, SC
             ATTR_BACKGROUND, pCondItemSet );
 
     Color aBgColor;
-    if ( rBrushItem.GetColor().GetAlpha() == 0 )
+    if ( aColorScale )
+        aBgColor = *aColorScale;
+    else if ( rBrushItem.GetColor().GetAlpha() == 0 )
         aBgColor = aHTMLStyle.aBackgroundColor; // No unwanted background color
     else
         aBgColor = rBrushItem.GetColor();