[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sc/source

[Samuel Mehrbrodt (via logerrit)]

 sc/source/core/data/column3.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c58c7293748c3620413bb8252a74359179e49855
Author:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Wed May 19 16:22:52 2021 +0200
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Mon Jun 28 10:55:46 2021 +0200

    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 at allotropia.de>
    (cherry picked from commit ade343ea8b498efb88473a0a3879c2711d7dd33c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116604
    Tested-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index cc3eee96f2cd..4ee065ad92aa 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2415,11 +2415,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())
         {