diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-08-26 14:04:37 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-08-27 10:35:27 -0400 |
| commit | 1b0a7dc8b787b7be31b1b58a5ea6a9fc7207996d (patch) | |
| tree | 327879ec4fb1480406f8abfeea29925be27b33e8 /sc | |
| parent | Quick indentation fix on closing brace. (diff) | |
| download | core-1b0a7dc8b787b7be31b1b58a5ea6a9fc7207996d.tar.gz core-1b0a7dc8b787b7be31b1b58a5ea6a9fc7207996d.zip | |
when swaping cols or rows insert notes at the right place, fdo#53979
Change-Id: I1228b3a064623e810265b47776e33f81f4bf0e51
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/table3.cxx | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index ef7b3b6a7e57..1ea61fb05a11 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -563,7 +563,9 @@ void ScTable::QuickSort( ScSortInfoArray* pArray, SCsCOLROW nLo, SCsCOLROW nHi ) void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2) { - for (SCROW nRow = aSortParam.nRow1; nRow <= aSortParam.nRow2; nRow++) + SCROW nRowStart = aSortParam.nRow1; + SCROW nRowEnd = aSortParam.nRow2; + for (SCROW nRow = nRowStart; nRow <= nRowEnd; nRow++) { aCol[nCol1].SwapCell(nRow, aCol[nCol2]); if (aSortParam.bIncludePattern) @@ -589,16 +591,19 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2) ScPostIt* pPostIt = itr->second; ++itr; - if (nCol == nCol1) + if(nRow >= nRowStart && nRow <= nRowEnd) { - aNoteMap.insert(nCol, nRow, pPostIt); - maNotes.ReleaseNote(nCol2, nRow); - } - else if (nCol == nCol2) - { - aNoteMap.insert(nCol, nRow, pPostIt); - maNotes.ReleaseNote(nCol1, nRow); + if (nCol == nCol1) + { + aNoteMap.insert(nCol2, nRow, pPostIt); + maNotes.ReleaseNote(nCol, nRow); + } + else if (nCol == nCol2) + { + aNoteMap.insert(nCol1, nRow, pPostIt); + maNotes.ReleaseNote(nCol, nRow); + } } } @@ -609,6 +614,7 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2) SCCOL nCol = itr->first.first; SCROW nRow = itr->first.second; ScPostIt* pPostIt = itr->second; + ++itr; maNotes.insert(nCol, nRow, pPostIt); aNoteMap.ReleaseNote(nCol, nRow); @@ -617,7 +623,9 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2) void ScTable::SwapRow(SCROW nRow1, SCROW nRow2) { - for (SCCOL nCol = aSortParam.nCol1; nCol <= aSortParam.nCol2; nCol++) + SCCOL nColStart = aSortParam.nCol1; + SCCOL nColEnd = aSortParam.nCol2; + for (SCCOL nCol = nColStart; nCol <= nColEnd; nCol++) { aCol[nCol].SwapRow(nRow1, nRow2); if (aSortParam.bIncludePattern) @@ -655,16 +663,18 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2) ScPostIt* pPostIt = itr->second; ++itr; - if (nRow == nRow1) + if( nCol >= nColStart && nCol <= nColEnd ) { - aNoteMap.insert(nCol, nRow, pPostIt); - maNotes.ReleaseNote(nCol, nRow2); - } - else if (nRow == nRow2) - { - aNoteMap.insert(nCol, nRow, pPostIt); - maNotes.ReleaseNote(nCol, nRow1); - + if (nRow == nRow1) + { + aNoteMap.insert(nCol, nRow2, pPostIt); + maNotes.ReleaseNote(nCol, nRow); + } + else if (nRow == nRow2) + { + aNoteMap.insert(nCol, nRow1, pPostIt); + maNotes.ReleaseNote(nCol, nRow); + } } } @@ -675,6 +685,7 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2) SCCOL nCol = itr->first.first; SCROW nRow = itr->first.second; ScPostIt* pPostIt = itr->second; + ++itr; maNotes.insert(nCol, nRow, pPostIt); aNoteMap.ReleaseNote(nCol, nRow); |