ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

limit rows to ones having data when computing ScSortedRangeCache

Browse Source 
Change-Id: I2de9ea4887b6101f10eb3b8da6f3596de0ea09eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134128
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák
2022-05-11 11:50:52 +02:00
parent 12b8230c9e
commit 905475435c
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/source/core/data/queryiter.cxx
+1
View File
@@ -45,6 +45,7 @@
#include <rowheightcontext.hxx>
#include <queryevaluator.hxx>
#include <rangecache.hxx>
#include <refdata.hxx>
#include <o3tl/safeint.hxx>
#include <tools/fract.hxx>
sc/source/core/tool/rangecache.cxx
+10 -2
View File
@@ -68,6 +68,14 @@ ScSortedRangeCache::ScSortedRangeCache(ScDocument* pDoc, const ScRange& rRange,
&& param.GetEntry(0).GetQueryItems().size() == 1);
const ScQueryEntry& entry = param.GetEntry(0);
const ScQueryEntry::Item& item = entry.GetQueryItem();
SCROW startRow = maRange.aStart.Row();
SCROW endRow = maRange.aEnd.Row();
SCCOL startCol = maRange.aStart.Col();
SCCOL endCol = maRange.aEnd.Col();
if (!pDoc->ShrinkToDataArea(nTab, startCol, startRow, endCol, endRow))
return;
if (mValues == ValueType::Values)
{
struct RowData
@@ -76,7 +84,7 @@ ScSortedRangeCache::ScSortedRangeCache(ScDocument* pDoc, const ScRange& rRange,
double value;
};
std::vector<RowData> rowData;
for (SCROW nRow = maRange.aStart.Row(); nRow <= maRange.aEnd.Row(); ++nRow)
for (SCROW nRow = startRow; nRow <= endRow; ++nRow)
{
ScRefCellValue cell(pDoc->GetRefCellValue(ScAddress(nCol, nRow, nTab)));
if (ScQueryEvaluator::isQueryByValue(entry, item, cell))
@@ -102,7 +110,7 @@ ScSortedRangeCache::ScSortedRangeCache(ScDocument* pDoc, const ScRange& rRange,
// Try to reuse as much ScQueryEvaluator code as possible, this should
// basically do the same comparisons.
ScQueryEvaluator evaluator(*pDoc, *pDoc->FetchTable(nTab), param, context);
for (SCROW nRow = maRange.aStart.Row(); nRow <= maRange.aEnd.Row(); ++nRow)
for (SCROW nRow = startRow; nRow <= endRow; ++nRow)
{
ScRefCellValue cell(pDoc->GetRefCellValue(ScAddress(nCol, nRow, nTab)));
if (ScQueryEvaluator::isQueryByString(entry, item, cell))