[Libreoffice-commits] core.git: sc/inc sc/source

[Eike Rathke (via logerrit)]

 sc/inc/column.hxx               |    2 +-
 sc/source/core/data/column3.cxx |    4 ++--
 sc/source/core/data/table3.cxx  |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 19533948370dc1ccd7334dbe1a8b7fc8330b10c0
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Wed Jul 27 17:40:31 2022 +0200
Commit:     Eike Rathke <er...@redhat.com>
CommitDate: Wed Jul 27 19:44:34 2022 +0200

    Name FilteredRow what it is, not hidden; tdf#117276 follow-up
    
    Also avoid defaulted parameter, it's only one more place to
    change.
    
    Change-Id: I64468fcd7085eff7a49bd0c359fdf14a31058af6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137511
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Jenkins

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 56aa1f9fc65e..a67a166646e2 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -600,7 +600,7 @@ public:
 
     void GetFilterEntries(
         sc::ColumnBlockConstPosition& rBlockPos, SCROW nStartRow, SCROW 
nEndRow,
-        ScFilterEntries& rFilterEntries, bool bFiltering, bool bHiddenRow = 
false );
+        ScFilterEntries& rFilterEntries, bool bFiltering, bool bFilteredRow );
 
     bool GetDataEntries( SCROW nRow, std::set<ScTypedStrData>& rStrings) const;
 
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index ebbefb03b714..1d255233bf58 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2670,10 +2670,10 @@ public:
 
 void ScColumn::GetFilterEntries(
     sc::ColumnBlockConstPosition& rBlockPos, SCROW nStartRow, SCROW nEndRow,
-    ScFilterEntries& rFilterEntries, bool bFiltering, bool bHiddenRow )
+    ScFilterEntries& rFilterEntries, bool bFiltering, bool bFilteredRow )
 {
     mbFiltering = bFiltering;
-    mbFilteredRow = bHiddenRow;
+    mbFilteredRow = bFilteredRow;
     FilterEntriesHandler aFunc(*this, rFilterEntries);
     rBlockPos.miCellPos =
         sc::ParseAll(rBlockPos.miCellPos, maCells, nStartRow, nEndRow, aFunc, 
aFunc);
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 52b4a0500a46..5a128152ad46 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2978,7 +2978,7 @@ void ScTable::GetFilterEntries( SCCOL nCol, SCROW nRow1, 
SCROW nRow2, ScFilterEn
 
     sc::ColumnBlockConstPosition aBlockPos;
     aCol[nCol].InitBlockPosition(aBlockPos);
-    aCol[nCol].GetFilterEntries(aBlockPos, nRow1, nRow2, rFilterEntries, 
bFiltering);
+    aCol[nCol].GetFilterEntries(aBlockPos, nRow1, nRow2, rFilterEntries, 
bFiltering, false /*bFilteredRow*/);
 }
 
 void ScTable::GetFilteredFilterEntries(
@@ -3000,11 +3000,11 @@ void ScTable::GetFilteredFilterEntries(
     {
         if (queryEvaluator.ValidQuery(j))
         {
-            aCol[nCol].GetFilterEntries(aBlockPos, j, j, rFilterEntries, 
bFiltering, false/*bHiddenRow*/);
+            aCol[nCol].GetFilterEntries(aBlockPos, j, j, rFilterEntries, 
bFiltering, false/*bFilteredRow*/);
         }
         else
         {
-            aCol[nCol].GetFilterEntries(aBlockPos, j, j, rFilterEntries, 
bFiltering, true/*bHiddenRow*/);
+            aCol[nCol].GetFilterEntries(aBlockPos, j, j, rFilterEntries, 
bFiltering, true/*bFilteredRow*/);
         }
     }
 }