From f1379133177b2c157019913d2fcdb075859adeb6 Mon Sep 17 00:00:00 2001 From: Dennis Francis Date: Tue, 22 Oct 2019 13:15:02 +0530 Subject: Ensure all formula-groups in the collection are threadable. When doing a multi-formula-group threading, add the missing check that all of the groups are themselves threadable. This was caught by crashtest document of tdf#77970. Change-Id: I42b83ef99ba30909df2b6d8c09d933916784844b Reviewed-on: https://gerrit.libreoffice.org/81307 Tested-by: Jenkins Reviewed-by: Dennis Francis --- sc/source/core/data/formulacell.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sc') diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 9eb36602d319..fafccf9dc769 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -4713,6 +4713,9 @@ static SCCOL lcl_probeLeftOrRightFGs(const ScFormulaCellGroupRef& xGroup, const if (!xNGroup) break; + if (!pCell->GetCode()->IsEnabledForThreading()) + break; + if (xNGroup->mpTopCell->aPos.Row() != aAddr.Row()) break; -- cgit