2 files changed, 34 insertions, 5 deletions

diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
index 92d5735ec5..166fa73659 100644
--- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
@@ -21,9 +21,16 @@ package org.apache.poi.xssf.usermodel;
 import java.io.IOException;
 
 import org.apache.poi.ss.usermodel.BaseTestSheetShiftColumns;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.util.CellAddress;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.XSSFITestDataProvider;
 import org.apache.poi.xssf.XSSFTestDataSamples;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class TestXSSFSheetShiftColumns extends BaseTestSheetShiftColumns {
     public TestXSSFSheetShiftColumns() {
@@ -40,4 +47,26 @@ class TestXSSFSheetShiftColumns extends BaseTestSheetShiftColumns {
         return XSSFTestDataSamples.writeOutAndReadBack(wb);
     }
 
+    @Test
+    public void testBug69154() throws Exception {
+        // this does not appear to work for HSSF but let's get it working for XSSF anyway
+        try (Workbook wb = _testDataProvider.createWorkbook()) {
+            Sheet sheet = wb.createSheet();
+            for (int i = 0; i < 4; i++) {
+                Row row = sheet.createRow(i);
+                for (int j = 0; j < 6; j++) {
+                    String value = new CellAddress(i, j).formatAsString();
+                    row.createCell(j).setCellValue(value);
+                }
+            }
+            final int firstRow = 1; // works with 0, but fails with 1!
+            final int secondRow = firstRow + 1;
+            sheet.addMergedRegion(new CellRangeAddress(firstRow, secondRow, 0, 0));
+            sheet.addMergedRegion(new CellRangeAddress(firstRow, firstRow, 1, 2));
+            sheet.addMergedRegion(new CellRangeAddress(firstRow, secondRow, 3, 3));
+            assertEquals(3, sheet.getNumMergedRegions());
+            sheet.shiftColumns(2, 5, -1);
+            assertEquals(2, sheet.getNumMergedRegions());
+        }
+    }
 }
\ No newline at end of file
diff --git a/poi/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java b/poi/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java
index c6d97f3ff6..cbd6f784c9 100644
--- a/poi/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java
@@ -105,16 +105,16 @@ public abstract class ColumnShifter extends BaseRowColShifter {
         // build a range of the columns that are overwritten, i.e. the target-area, but without
         // columns that are moved along
         final CellRangeAddress overwrite;
-        if(n > 0) {
+        if (n > 0) {
             // area is moved down => overwritten area is [endColumn + n - movedColumns, endColumn + n]
             final int firstCol = Math.max(endColumn + 1, endColumn + n - movedColumns);
             final int lastCol = endColumn + n;
-            overwrite = new CellRangeAddress(0, 0, firstCol, lastCol);
+            overwrite = new CellRangeAddress(merged.getFirstRow(), merged.getLastRow(), firstCol, lastCol);
         } else {
             // area is moved up => overwritten area is [startColumn + n, startColumn + n + movedColumns]
             final int firstCol = startColumn + n;
             final int lastCol = Math.min(startColumn - 1, startColumn + n + movedColumns);
-            overwrite = new CellRangeAddress(0, 0, firstCol, lastCol);
+            overwrite = new CellRangeAddress(merged.getFirstRow(), merged.getLastRow(), firstCol, lastCol);
         }
 
         // if the merged-region and the overwritten area intersect, we need to remove it
@@ -122,12 +122,12 @@ public abstract class ColumnShifter extends BaseRowColShifter {
     }
 
     public void shiftColumns(int firstShiftColumnIndex, int lastShiftColumnIndex, int step){
-        if(step > 0){
+        if (step > 0) {
             for (Row row : sheet)
                 if(row != null)
                     row.shiftCellsRight(firstShiftColumnIndex, lastShiftColumnIndex, step);
         }
-        else if(step < 0){
+        else if (step < 0) {
             for (Row row : sheet)
                 if(row != null)
                     row.shiftCellsLeft(firstShiftColumnIndex, lastShiftColumnIndex, -step);