[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 26 19:16:35 UTC 2020
sc/source/core/tool/interpr5.cxx | 9 ---------
1 file changed, 9 deletions(-)
New commits:
commit 7a236dc5dfbd367de2a83f14fad70aa36e0fd379
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 25 08:35:37 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jun 26 21:16:01 2020 +0200
Revert "tdf#133858 opening spreadsheet with large array formula takes 10 mins" (tdf#134234)
This reverts commit 9a5f2961b085ce2f23ecdf0a03d1114bacac8e2c.
Reason for revert: causes regression, see tdf#134234
Change-Id: I1cc3e6daa0e65231e8a4d7c1ae4a60cfdf106457
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97055
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 5de62ce07bfe..aefb26c920e3 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -325,15 +325,6 @@ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken
return nullptr;
}
- // Clamp the size of the matrix to rows which actually contain data.
- // For e.g. SUM(IF over an entire column, this can make a big difference.
- // Limit to ocEqual opcode for now, some opcodes behaviour differently if the
- // input has empty space.
- if (nTab1 == nTab2 && pCur->GetOpCode() == ocEqual)
- {
- pDok->ShrinkToDataArea(nTab1, nCol1, nRow1, nCol2, nRow2);
- }
-
SCSIZE nMatCols = static_cast<SCSIZE>(nCol2 - nCol1 + 1);
SCSIZE nMatRows = static_cast<SCSIZE>(nRow2 - nRow1 + 1);
More information about the Libreoffice-commits
mailing list