diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-09-22 04:44:35 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-24 11:36:01 -0400 |
| commit | ae584d265c59c54608c63697559c0ed911601aeb (patch) | |
| tree | 25ec942774a6df367118ca233f611b0a626b48a7 /sc/source/core | |
| parent | 34fa2a6763a6f17ffa4f38984d5beac13805515e (diff) | |
some more fixes for ScRangeList::DeleteArea
Change-Id: I7f4cf6b053d7cff85e46ecf51cbf8a327530de67
Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/tool/rangelst.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index f33659da6ecc..8214c507e958 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -608,7 +608,7 @@ bool handleTwoRanges( const ScRange& rDeleteRange, ScRange* p, std::vector<ScRan { // column deleted : |-------| // column original: |-------| - if (nRow1 < nDeleteRow1 && nDeleteRow1 < nRow2 && nRow2 <= nDeleteRow2) + if (nRow1 < nDeleteRow1 && nDeleteRow1 <= nRow2 && nRow2 <= nDeleteRow2) { // row deleted: |------| // row original: |------| @@ -627,7 +627,7 @@ bool handleTwoRanges( const ScRange& rDeleteRange, ScRange* p, std::vector<ScRan p->aEnd.SetRow(nDeleteRow1-1); // 1 return true; } - else if (nRow1 < nDeleteRow2 && nDeleteRow2 < nRow2 && nDeleteRow1 <= nRow1) + else if (nRow1 <= nDeleteRow2 && nDeleteRow2 < nRow2 && nDeleteRow1 <= nRow1) { // row deleted: |------| // row original: |------| @@ -651,7 +651,7 @@ bool handleTwoRanges( const ScRange& rDeleteRange, ScRange* p, std::vector<ScRan { // column deleted : |-------| // column original: |-------| - if (nRow1 < nDeleteRow1 && nDeleteRow1 < nRow2 && nRow2 <= nDeleteRow2) + if (nRow1 < nDeleteRow1 && nDeleteRow1 <= nRow2 && nRow2 <= nDeleteRow2) { // row deleted: |------| // row original: |------| @@ -671,7 +671,7 @@ bool handleTwoRanges( const ScRange& rDeleteRange, ScRange* p, std::vector<ScRan p->aEnd.SetRow(nDeleteRow1-1); // 1 return true; } - else if (nRow1 < nDeleteRow2 && nDeleteRow2 < nRow2 && nDeleteRow1 <= nRow1) + else if (nRow1 <= nDeleteRow2 && nDeleteRow2 < nRow2 && nDeleteRow1 <= nRow1) { // row deleted: |-------| // row original: |--------| @@ -755,10 +755,10 @@ template<typename X, typename Y> bool checkForThreeRanges( X nDeleteX1, X nDeleteX2, Y nDeleteY1, Y nDeleteY2, X nX1, X nX2, Y nY1, Y nY2) { - if (nX1 < nDeleteX1 && nX2 <= nDeleteX2 && nY1 < nDeleteY1 && nDeleteY2 < nY2) + if (nX1 <= nDeleteX1 && nX2 <= nDeleteX2 && nY1 < nDeleteY1 && nDeleteY2 < nY2) return true; - if (nDeleteX1 <= nX1 && nDeleteX2 < nX2 && nY1 < nDeleteY1 && nDeleteY2 < nY2) + if (nDeleteX1 <= nX1 && nDeleteX2 <= nX2 && nY1 < nDeleteY1 && nDeleteY2 < nY2) return true; return false; |