diff options
| author | Eike Rathke <erack@redhat.com> | 2016-07-16 01:43:11 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-07-20 13:06:45 +0200 |
| commit | ce0b14a644e7be95b676cd471dd00d076e19828c (patch) | |
| tree | 697429977c2a86bda132d53354d7b9aa6ae24c2c /sc | |
| parent | fab6451ee64fa9aea8dc3ec2ddb733eb7fcd6c83 (diff) | |
Resolves: tdf#100764 check row when determining bounds for deleted range
Regression introduced with a2e591e26549294cdb07eb685d4069343404d898 for tdf#86502
Change-Id: I493c458faedccfd6e2ddf849073a52661ef2e4d0
(cherry picked from commit ab1b351840160655a9f0caedbb35e9fdf203c5a0)
Reviewed-on: https://gerrit.libreoffice.org/27246
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 9bcc12e3b8f29067443b96cfc20cca5d183ed5cd)
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/token.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index f516a765e5e7..0ba6c520bc4f 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -4251,7 +4251,10 @@ void checkBounds( if (pDeletedRange && aAbs.aStart.Row() <= pDeletedRange->aStart.Row()) { SCROW nOffset = pDeletedRange->aStart.Row() - aAbs.aStart.Row(); - rBounds.push_back(rPos.Row()+nOffset); + SCROW nRow = rPos.Row() + nOffset; + // Unlike for rCheckRange, for pDeletedRange nRow can be anywhere>=0. + if (ValidRow(nRow)) + rBounds.push_back(nRow); } if (aAbs.aEnd.Row() >= rCheckRange.aEnd.Row()) @@ -4273,7 +4276,10 @@ void checkBounds( if (pDeletedRange && aAbs.aEnd.Row() >= pDeletedRange->aEnd.Row()) { SCROW nOffset = pDeletedRange->aEnd.Row() + 1 - aAbs.aStart.Row(); - rBounds.push_back(rPos.Row()+nOffset); + SCROW nRow = rPos.Row() + nOffset; + // Unlike for rCheckRange, for pDeletedRange nRow can be ~anywhere. + if (ValidRow(nRow)) + rBounds.push_back(nRow); } } |