[Libreoffice-commits] core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/core/data/table3.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 156fad36377ba369065bacad863a31c808314069
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun May 30 17:18:01 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun May 30 20:59:41 2021 +0200

    crashtesting: on export of fdo84621-4.ods to xls
    
    Change-Id: I0553a7584347e0fc3ebcba6f99e974b9b1d341a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116412
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 216aa98e978a..7d86e77bdaa3 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -3548,6 +3548,9 @@ bool ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCR
 
 void ScTable::GetFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, ScFilterEntries& rFilterEntries )
 {
+    if (nCol >= aCol.size())
+        return;
+
     sc::ColumnBlockConstPosition aBlockPos;
     aCol[nCol].InitBlockPosition(aBlockPos);
     aCol[nCol].GetFilterEntries(aBlockPos, nRow1, nRow2, rFilterEntries, false);
@@ -3556,6 +3559,9 @@ void ScTable::GetFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, ScFilterEn
 void ScTable::GetFilteredFilterEntries(
     SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, ScFilterEntries& rFilterEntries, bool bFiltering )
 {
+    if (nCol >= aCol.size())
+        return;
+
     sc::ColumnBlockConstPosition aBlockPos;
     aCol[nCol].InitBlockPosition(aBlockPos);