diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-03-12 14:16:14 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-03-13 07:22:35 +0100 |
| commit | 61580fcbd10bad2e0aab663d4c8fe43c1e01f92c (patch) | |
| tree | 0c5a25e6603c8258a2c02212176a96e5130c8724 /sc/source/core/data/fillinfo.cxx | |
| parent | 72f1800ad2f3717192287ae2678e8209e66e35d1 (diff) | |
tdf#160117: check bAnyCondition
Commit edbc3a09edcf58a4738b4648811a065f3f55bc7c (sc: Don't end
handleConditionalFormat early, 2023-11-02) intended to allow to apply
several different categories of conditions to the same cell: e.g.,
color scale or databar, in addition to the normal style application
depending on a condition.
This change fixes a regression, when the found matching condition did
not stop search for the matching conditions to apply a style.
Change-Id: Ia4cf1dd35a964c6ca523050dc727184ca22a8dfd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164687
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc/source/core/data/fillinfo.cxx')
| -rw-r--r-- | sc/source/core/data/fillinfo.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 8ab35f34c079..7afa00b86543 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -298,7 +298,7 @@ bool handleConditionalFormat(ScConditionalFormatList& rCondFormList, const ScCon ScCondFormatData aData = pCondForm->GetData( pInfo->maCell, rAddr); - if (!aData.aStyleName.isEmpty()) + if (!bAnyCondition && !aData.aStyleName.isEmpty()) { SfxStyleSheetBase* pStyleSheet = pStlPool->Find( aData.aStyleName, SfxStyleFamily::Para ); @@ -339,7 +339,7 @@ bool handleConditionalFormat(ScConditionalFormatList& rCondFormList, const ScCon pTableInfo->addIconSetInfo(std::move(aData.pIconSet)); } - if (pInfo->mxColorScale && pInfo->pIconSet && pInfo->pDataBar) + if (bAnyCondition && pInfo->mxColorScale && pInfo->pIconSet && pInfo->pDataBar) break; } |