diff options
| author | Eike Rathke <erack@redhat.com> | 2016-07-16 01:43:11 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-07-16 01:51:55 +0200 |
| commit | ab1b351840160655a9f0caedbb35e9fdf203c5a0 (patch) | |
| tree | 30f52f16b8fccb36a86e54e20e761e651f326b76 /sc/source | |
| parent | a2c557d80ac68c06ea59586245a7431e061938f0 (diff) | |
Resolves: tdf#100764 check row when determining bounds for deleted range
Regression introduced with a2e591e26549294cdb07eb685d4069343404d898 for tdf#86502
Change-Id: I493c458faedccfd6e2ddf849073a52661ef2e4d0
Diffstat (limited to 'sc/source')
| -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 f81a34b88f7f..2d7b0160b67d 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -4414,7 +4414,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()) @@ -4436,7 +4439,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); } } |