trim also empty leading column ranges, fdo#81501 follow-up

Change-Id: Ieaeea85149e4b6d263b112205bb17c155e2d12be

trim also empty leading column ranges, fdo#81501 follow-up
Change-Id: Ieaeea85149e4b6d263b112205bb17c155e2d12be
c7b57c6c · Eike Rathke · 1e4235f8 · c7b57c6c
Kaydet (Commit) c7b57c6c authored Ara 05, 2014 tarafından Eike Rathke
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

table3.cxx sc/source/core/data/table3.cxx +4 -1

No files found.
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1541,7 +1541,10 @@ void ScTable::Sort(
        pUndo->mbUpdateRefs = bUpdateRefs;
    }

-    while (aSortParam.nCol2 > aSortParam.nCol1 && aCol[aSortParam.nCol2].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
+    // Trim empty leading and trailing column ranges.
+    while (aSortParam.nCol1 < aSortParam.nCol2 && aCol[aSortParam.nCol1].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
+        ++aSortParam.nCol1;
+    while (aSortParam.nCol1 < aSortParam.nCol2 && aCol[aSortParam.nCol2].IsEmptyBlock(aSortParam.nRow1, aSortParam.nRow2))
        --aSortParam.nCol2;

    if (rSortParam.bByRow)