Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

POI Bug 69154: Shifting columns with merged regions generates an error about overlapping regions #1438

Closed
wants to merge 1 commit into from
+4 −9
Closed

POI Bug 69154: Shifting columns with merged regions generates an error about overlapping regions #1438

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions main/SS/UserModel/Helpers/RowShifter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,7 @@ public List<CellRangeAddress> ShiftMergedRegions(int startRow, int endRow, int n
var merged = sheet.GetMergedRegion(i);

// remove merged region that overlaps Shifting
var lastCol = sheet.GetRow(startRow) != null
? sheet.GetRow(startRow).LastCellNum
: sheet.GetRow(endRow) != null
? sheet.GetRow(endRow).LastCellNum
: 0;
if (RemovalNeeded(merged, startRow, endRow, n, lastCol))
if (RemovalNeeded(merged, startRow, endRow, n))
{
removedIndices.Add(i);
continue;
Expand Down Expand Up @@ -103,7 +98,7 @@ public List<CellRangeAddress> ShiftMergedRegions(int startRow, int endRow, int n
}

// Keep in sync with {@link ColumnShifter#removalNeeded}
private bool RemovalNeeded(CellRangeAddress merged, int startRow, int endRow, int n, int lastCol)
private bool RemovalNeeded(CellRangeAddress merged, int startRow, int endRow, int n)
{
var movedRows = endRow - startRow + 1;

Expand All @@ -115,14 +110,14 @@ private bool RemovalNeeded(CellRangeAddress merged, int startRow, int endRow, in
// area is moved down => overwritten area is [endRow + n - movedRows, endRow + n]
var firstRow = Math.Max(endRow + 1, endRow + n - movedRows);
var lastRow = endRow + n;
overwrite = new CellRangeAddress(firstRow, lastRow, 0, lastCol);
overwrite = new CellRangeAddress(firstRow, lastRow, merged.FirstColumn, merged.LastColumn);
}
else
{
// area is moved up => overwritten area is [startRow + n, startRow + n + movedRows]
var firstRow = startRow + n;
var lastRow = Math.Min(startRow - 1, startRow + n + movedRows);
overwrite = new CellRangeAddress(firstRow, lastRow, 0, lastCol);
overwrite = new CellRangeAddress(firstRow, lastRow, merged.FirstColumn, merged.LastColumn);
}

// if the merged-region and the overwritten area intersect, we need to remove it
Expand Down
Loading