core.git: Branch 'distro/cib/libreoffice-6-4' - sc/source

[Noel Grandin (via logerrit)]

Rebased ref, commits from common ancestor:
commit 5a0fb95789651c05774cdc566eeda0d3151a811c
Author:     Noel Grandin <n...@peralex.com>
AuthorDate: Wed Feb 3 15:19:20 2021 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sun Dec 10 21:52:45 2023 +0100

    tdf#140014 calc crash on COUNTIF
    
    regression from jumbo-sheets work
    
    Change-Id: I207cf3cc4c6d295688936ea3b672b32f9c09d89a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110349
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index ed55445d0558..efbd720c249d 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1460,6 +1460,8 @@ ScCountIfCellIterator::ScCountIfCellIterator(ScDocument* 
pDocument, const ScInte
     mrContext( rContext ),
     nTab( nTable)
 {
+    maParam.nCol1 = 
pDoc->maTabs[nTable]->ClampToAllocatedColumns(maParam.nCol1);
+    maParam.nCol2 = 
pDoc->maTabs[nTable]->ClampToAllocatedColumns(maParam.nCol2);
     nCol = maParam.nCol1;
     nRow = maParam.nRow1;
 }