summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2021-05-19 16:22:52 +0200
committerSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2021-05-20 08:15:47 +0200
commitade343ea8b498efb88473a0a3879c2711d7dd33c (patch)
treee8ddf90cce2f47ccb2d7002be65c5713fa3dc94d
parent9964531fbe6c5805ef823ca3eeb7080e4d42c333 (diff)
tdf#76258 Skip automatic colors in color filter popup
Change-Id: Ic8ed4b2a503c347895668b18744c9fee02d92e81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115815 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
-rw-r--r--sc/source/core/data/column3.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index de6870a6a9c9..405fb4363897 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2429,11 +2429,13 @@ class FilterEntriesHandler
ScAddress aPos(rColumn.GetCol(), nRow, rColumn.GetTab());
const SvxColorItem* pColor = rColumn.GetDoc().GetAttr(aPos, ATTR_FONT_COLOR);
Color textColor = pColor->GetValue();
+ if (textColor != COL_AUTO)
+ mrFilterEntries.addTextColor(textColor);
const SvxBrushItem* pBrush = rColumn.GetDoc().GetAttr(aPos, ATTR_BACKGROUND);
Color backgroundColor = pBrush->GetColor();
- mrFilterEntries.addTextColor(textColor);
- mrFilterEntries.addBackgroundColor(backgroundColor);
+ if (backgroundColor != COL_AUTO)
+ mrFilterEntries.addBackgroundColor(backgroundColor);
if (rCell.hasString())
{