[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-1' - sc/inc sc/source

[Balazs Varga (via logerrit)]

 sc/inc/queryentry.hxx           |    1 -
 sc/source/core/data/column3.cxx |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2e4e18b4727c6c299f1bb64f1c3c8948334f4282
Author:     Balazs Varga <balazs.varga...@gmail.com>
AuthorDate: Thu Oct 21 16:15:21 2021 +0200
Commit:     Balazs Varga <varga.bala...@nisz.hu>
CommitDate: Thu Oct 21 16:18:31 2021 +0200

    Clean up: tdf#144740 Fix broken compareByValue() query, tdf#142910 
tdf#144253
    
    clean up
    
    Change-Id: I0be022743f6ecc9801b088136ccf3646ddc6556f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123998
    Tested-by: Balazs Varga <varga.bala...@nisz.hu>
    Reviewed-by: Balazs Varga <varga.bala...@nisz.hu>

diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index c107b438a1c2..272111a09354 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -39,7 +39,6 @@ struct SC_DLLPUBLIC ScQueryEntry
         QueryType         meType;
         double            mfVal;
         svl::SharedString maString;
-        Color             maColor;
         bool              mbMatchEmpty;
         bool              mbRoundForFilter;
 
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index fad939b9dcf6..6b40bc95da4b 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2484,7 +2484,7 @@ class FilterEntriesHandler
         // store the formatted/rounded value for filtering
 
         if ((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0 && !bDate)
-            mrFilterEntries.push_back(ScTypedStrData(aStr, fVal, 
rColumn.GetDoc().RoundValueAsShown(fVal, nFormat), ScTypedStrData::Value, 
bDate));
+            mrFilterEntries.push_back(ScTypedStrData(aStr, fVal, 
mrColumn.GetDoc().RoundValueAsShown(fVal, nFormat), ScTypedStrData::Value, 
bDate));
         else
             mrFilterEntries.push_back(ScTypedStrData(aStr, fVal, fVal, 
ScTypedStrData::Value, bDate));
     }