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

[offtkp (via logerrit)]

 sc/source/core/data/fillinfo.cxx |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit cb53d9731a8dcb51596b4181b8fefd462854d984
Author:     offtkp <parisop...@gmail.com>
AuthorDate: Wed Nov 1 18:52:35 2023 +0200
Commit:     Paris Oplopoios <parisop...@gmail.com>
CommitDate: Wed Nov 1 20:28:46 2023 +0100

    sc: Don't end handleConditionalFormat early
    
    handleConditionalFormat would exit the conditional format searching loop
    which meant that cells with overlapping conditional formatting rules
    would not get properly rendered
    
    Change-Id: I98664c758cc2c8f844994e6dcecdc57df2213a01
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158767
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 7c95701e9705..2dc9d5960128 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -287,7 +287,6 @@ bool handleConditionalFormat(ScConditionalFormatList& 
rCondFormList, const ScCon
         ScCellInfo* pInfo, ScTableInfo* pTableInfo, ScStyleSheetPool* pStlPool,
         const ScAddress& rAddr, bool& bHidden, bool& bHideFormula, bool 
bTabProtect)
 {
-    bool bFound = false;
     bool bAnyCondition = false;
     for(const auto& rCondFormat : rCondFormats)
     {
@@ -317,33 +316,28 @@ bool handleConditionalFormat(ScConditionalFormatList& 
rCondFormList, const ScCon
                     bHideFormula = pProtAttr->GetHideFormula();
 
                 }
-                bFound = true;
-
             }
             // if style is not there, treat like no condition
         }
 
-        if(aData.mxColorScale)
+        if(aData.mxColorScale && !pInfo->mxColorScale)
         {
             pInfo->mxColorScale = aData.mxColorScale;
-            bFound = true;
         }
 
-        if(aData.pDataBar)
+        if(aData.pDataBar && !pInfo->pDataBar)
         {
             pInfo->pDataBar = aData.pDataBar.get();
             pTableInfo->addDataBarInfo(std::move(aData.pDataBar));
-            bFound = true;
         }
 
-        if(aData.pIconSet)
+        if(aData.pIconSet && !pInfo->pIconSet)
         {
             pInfo->pIconSet = aData.pIconSet.get();
             pTableInfo->addIconSetInfo(std::move(aData.pIconSet));
-            bFound = true;
         }
 
-        if (bFound)
+        if (pInfo->mxColorScale && pInfo->pIconSet && pInfo->pDataBar)
             break;
     }