From b35f6971561bc095965e82f230e0307f6694228b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 22 Jan 2021 21:17:25 +0000 Subject: sc: GetRowForHeight performance improvement. Instead of just skipping hidden rows, either skip or interpolate into visible ones. This method, and it's single caller look rather unusual to me. It is unclear why we would want to return the results we do, and why the one caller subtracts a row. Some surprising proportion of tile rendering was exercising this code path extremely slowly. --5.94%--ScDocument::GetPrintArea | |--5.04%--ScDrawLayer::GetPrintArea | ScTable::GetRowForHeight | | | --4.58%--ScFlatBoolRowSegments::getRangeData | | | --2.46%--ScFlatSegmentsImpl::getRangeData Change-Id: I75418d6af59a33b99e8bb0c374139e1a4ee6ef87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109837 Tested-by: Jenkins CollaboraOffice Tested-by: Michael Meeks Reviewed-by: Ashod Nakashian Reviewed-by: Michael Meeks Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109848 Tested-by: Jenkins --- sc/source/core/data/table2.cxx | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 1ddf2993b170..a980774c7b9d 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -3996,16 +3996,25 @@ SCROW ScTable::GetRowForHeight(sal_uLong nHeight) const break; } - nSum += aRowHeightRange.mnValue; + // find the last common row between hidden & height spans + SCROW nLastCommon = std::min(aData.mnRow2, aRowHeightRange.mnRow2); + assert (nLastCommon >= nRow); + SCROW nCommon = nLastCommon - nRow + 1; - if (nSum > nHeight) + // how much further to go ? + sal_uLong nPixelsLeft = nHeight - nSum; + sal_uLong nCommonPixels = aRowHeightRange.mnValue * nCommon; + + // are we in the zone ? + if (nCommonPixels > nPixelsLeft) { + nRow += (nPixelsLeft + aRowHeightRange.mnValue - 1) / aRowHeightRange.mnValue; + + // FIXME: finding this next row is far from elegant, + // we have a single caller, which subtracts one as well(!?) if (nRow >= rDocument.MaxRow()) return rDocument.MaxRow(); - // Find the next visible row. - ++nRow; - if (!mpHiddenRows->getRangeData(nRow, aData)) // Failed to fetch the range data for whatever reason. break; @@ -4016,6 +4025,10 @@ SCROW ScTable::GetRowForHeight(sal_uLong nHeight) const return nRow <= rDocument.MaxRow() ? nRow : rDocument.MaxRow(); } + + // skip the range and keep hunting + nSum += nCommonPixels; + nRow = nLastCommon; } return -1; } -- cgit