Unnecessary to remember mbFiltering at column, tdf#140968 tdf#140978 follow-up

It's inviting confusion and only needed for FilterEntriesHandler,
so pass it there.

Change-Id: I8056bf8e8f563b28358c46b19071e7caa69c88a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137513
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins

3 files changed, 5 insertions, 8 deletions

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index ba964cdfee89..4cc57f418e91 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -203,7 +203,6 @@ class ScColumn : protected ScColumnData
     SCCOL           nCol;
     SCTAB           nTab;
 
-    bool mbFiltering : 1; // it is true if there is a filtering in the column
     bool mbEmptyBroadcastersPending : 1; // a broadcaster not removed during EnableDelayDeletingBroadcasters()
 
 friend class ScDocument;                    // for FillInfo
@@ -254,7 +253,6 @@ public:
     using ScColumnData::GetDoc;
     SCTAB GetTab() const { return nTab; }
     SCCOL GetCol() const { return nCol; }
-    bool HasFiltering() const { return mbFiltering; }
     sc::CellStoreType& GetCellStore() { return maCells; }
     const sc::CellStoreType& GetCellStore() const { return maCells; }
     sc::CellTextAttrStoreType& GetCellAttrStore() { return maCellTextAttrs; }
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 7ebba48b5792..fea2f84e5be0 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -88,7 +88,6 @@ ScColumn::ScColumn(ScSheetLimits const & rSheetLimits) :
     mnBlkCountFormula(0),
     nCol( 0 ),
     nTab( 0 ),
-    mbFiltering( false ),
     mbEmptyBroadcastersPending( false )
 {
     maCells.resize(rSheetLimits.GetMaxRowCount());
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index ceb06b11b481..6956951cf765 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2488,13 +2488,14 @@ class FilterEntriesHandler
 {
     ScColumn& mrColumn;
     ScFilterEntries& mrFilterEntries;
+    bool mbFiltering;
     bool mbFilteredRow;
 
     void processCell(const ScColumn& rColumn, SCROW nRow, ScRefCellValue& rCell)
     {
         SvNumberFormatter* pFormatter = mrColumn.GetDoc().GetFormatTable();
         sal_uLong nFormat = mrColumn.GetNumberFormat(mrColumn.GetDoc().GetNonThreadedContext(), nRow);
-        OUString aStr = ScCellFormat::GetInputString(rCell, nFormat, *pFormatter, mrColumn.GetDoc(), mrColumn.HasFiltering());
+        OUString aStr = ScCellFormat::GetInputString(rCell, nFormat, *pFormatter, mrColumn.GetDoc(), mbFiltering);
 
         // Colors
         ScAddress aPos(rColumn.GetCol(), nRow, rColumn.GetTab());
@@ -2624,8 +2625,8 @@ class FilterEntriesHandler
     }
 
 public:
-    FilterEntriesHandler(ScColumn& rColumn, ScFilterEntries& rFilterEntries, bool bFilteredRow) :
-        mrColumn(rColumn), mrFilterEntries(rFilterEntries), mbFilteredRow(bFilteredRow) {}
+    FilterEntriesHandler(ScColumn& rColumn, ScFilterEntries& rFilterEntries, bool bFiltering, bool bFilteredRow) :
+        mrColumn(rColumn), mrFilterEntries(rFilterEntries), mbFiltering(bFiltering), mbFilteredRow(bFilteredRow) {}
 
     void operator() (size_t nRow, double fVal)
     {
@@ -2673,8 +2674,7 @@ void ScColumn::GetFilterEntries(
     sc::ColumnBlockConstPosition& rBlockPos, SCROW nStartRow, SCROW nEndRow,
     ScFilterEntries& rFilterEntries, bool bFiltering, bool bFilteredRow )
 {
-    mbFiltering = bFiltering;
-    FilterEntriesHandler aFunc(*this, rFilterEntries, bFilteredRow);
+    FilterEntriesHandler aFunc(*this, rFilterEntries, bFiltering, bFilteredRow);
     rBlockPos.miCellPos =
         sc::ParseAll(rBlockPos.miCellPos, maCells, nStartRow, nEndRow, aFunc, aFunc);
 }