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

[Noel Grandin (via logerrit)]

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

New commits:
commit 2f120bb3b9020544390d7940982877942ce5d63c
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Sep 10 15:27:01 2021 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Mon Sep 20 14:28:03 2021 +0200

    crash in tdf132431-1.ods --export-to xls
    
    probably related to
        commit 817ef891cf2bef8fdc82852f73acb422afb89bd2
        tdf#142579 Consider color scale background colors in color filter
    
    Change-Id: I30bc477319ffc5474d9a27c4955603a183cccf12
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121906
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit 57a1d8d2c3ce8741c0bfbaa66160f6091a1c7f68)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122053
    Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 3f89d278a903..64e40b8b7cf8 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2460,8 +2460,12 @@ class FilterEntriesHandler
                 {
                     const ScColorScaleFormat* pColFormat
                         = static_cast<const ScColorScaleFormat*>(aEntry);
-                    backgroundColor = *(pColFormat->GetColor(aPos));
-                    bHasConditionalBackgroundColor = true;
+                    boost::optional<Color> oColor = pColFormat->GetColor(aPos);
+                    if (oColor)
+                    {
+                        backgroundColor = *oColor;
+                        bHasConditionalBackgroundColor = true;
+                    }
                 }
             }
         }