| commit | e2ec8e1f3fac6fc0a426b5735ad21371c68760ae | [log] |
|---|---|---|
| author | Noel Grandin <noel.grandin@collabora.co.uk> | Thu Jun 25 08:35:37 2020 +0200 |
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | Thu Jun 25 11:54:02 2020 +0200 |
| tree | 971b4cd84c37c0383a1f168e626b2961248b83e5 | |
| parent | 8c28d391d5a7bacd5be4da6698bfbf8fd0fcdf22 [diff] |
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/+/97054 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 6f151be2994b0e78a890c13ccdd9249f1800c6de) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97057 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index eeb3d71..685a2cf 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx
@@ -325,15 +325,6 @@ 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);