diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-11-23 14:39:19 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-23 21:27:51 +0100 |
commit | 6f394daa4828743a165121d9e8e1e2c7a63a1200 (patch) | |
tree | 1edbb5efffc2b56d8f5f185683ac53d46bb4c6ef /sc | |
parent | 8c9a3195068bf00e00290f363d5028e9986bbba6 (diff) |
crashtesting: crash loading fdo41403-1.xlsm
regression since...
commit 3af8a4faf5e20ccae2386052697713da160afb16
Date: Wed Nov 15 13:10:40 2017 +0300
tdf#113861: Less aggressive expansion of chart headers.
pre-change code had...
FormulaToken* pToken = it2->second;
if (pToken && nRow>=nHeaderRowCount)
check, so restore that check for presence of FormulaToken
Change-Id: Ia1b301e4f7fdf447b08de7fb22bd7fde8735bd52
Reviewed-on: https://gerrit.libreoffice.org/45155
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index f280a14c42fd..7aae443e1089 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -301,7 +301,7 @@ Chart2PositionMap::Chart2PositionMap(SCCOL nAllColCount, SCROW nAllRowCount, for ( const auto & rCell : *rCol.second ) { // Skip header rows - if (rCell.first < nHeaderRowCount ) + if (rCell.first < nHeaderRowCount || !rCell.second) continue; ScRange aRange; |