diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-11-28 08:43:54 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-29 21:42:21 +0100 |
| commit | 9391b071d5e651f4d9dc963944b28b078cf26bfa (patch) | |
| tree | dc31237873607478e94074935fa6fd45d4f78f11 | |
| parent | bump product version to 7.0.4.1.0+ (diff) | |
| download | core-9391b071d5e651f4d9dc963944b28b078cf26bfa.tar.gz core-9391b071d5e651f4d9dc963944b28b078cf26bfa.zip | |
tdf#138466 Crash when creating different scenarios
apparently this is a regression from
commit 4176beb7ef831152ce92ac3fa31314438635ec2c
Author: Noel Grandin <noelgrandin@gmail.com>
Date: Sat Sep 12 18:21:44 2020 +0200
tdf#133327 fix calc loading background color with many cols
but I have no idea how or why, so just fix the crash.
Change-Id: Ia2f056fc53527338c431d3b34bb64e6eedc8e955
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106799
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 52aebe6986bcec07071adb3f94d6c09fea147044)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106748
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 7f2828aa84f87c85c92969a9b0eace4df75870df)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106811
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index a8de8508f4d1..12d3b0eb6b9b 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -866,8 +866,9 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const ScRange& aColumnHe nColsRepeated = 1; } } - assert(nPrevIndex >= 0 && "coverity#1438402"); - WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible); + // tdf#138466 + if (nPrevIndex != -1) + WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible); if (!bIsClosed) CloseHeaderColumn(); if (pGroupColumns->IsGroupEnd(nColumn - 1)) |