Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 56958: patch from Yaniv Kunda: check that cells containing array formulas do not belong to a merged region 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1749210 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-06-19 22:00:44 +00:00
parent 9a769fcb0b
commit a15ca7acfc
2 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
View File

@ -749,9 +749,7 @@ public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {
if (cell.isPartOfArrayFormulaGroup()) { if (cell.isPartOfArrayFormulaGroup()) {
CellRangeAddress arrayRange = cell.getArrayFormulaRange(); CellRangeAddress arrayRange = cell.getArrayFormulaRange();
if (arrayRange.getNumberOfCells() > 1 && if (arrayRange.getNumberOfCells() > 1 && region.intersects(arrayRange)) {
(arrayRange.isInRange(region.getFirstRow(), region.getFirstColumn()) ||
arrayRange.isInRange(region.getFirstRow(), region.getFirstColumn()))) {
String msg = "The range " + region.formatAsString() + " intersects with a multi-cell array formula. " + String msg = "The range " + region.formatAsString() + " intersects with a multi-cell array formula. " +
"You cannot merge cells of an array."; "You cannot merge cells of an array.";
throw new IllegalStateException(msg); throw new IllegalStateException(msg);

51
src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
View File

@ -27,6 +27,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import org.apache.poi.ss.ITestDataProvider; import org.apache.poi.ss.ITestDataProvider;
import org.apache.poi.ss.formula.FormulaParseException; import org.apache.poi.ss.formula.FormulaParseException;
@ -467,7 +468,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas {
} }
@Test @Test
public void testModifyArrayCells_mergeCells() throws IOException { public void testModifyArrayCells_mergeCellsSingle() throws IOException {
Workbook workbook = _testDataProvider.createWorkbook(); Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet(); Sheet sheet = workbook.createSheet();
assertEquals(0, sheet.getNumMergedRegions()); assertEquals(0, sheet.getNumMergedRegions());
@ -482,18 +483,54 @@ public abstract class BaseTestSheetUpdateArrayFormulas {
assertTrue(scell.isPartOfArrayFormulaGroup()); assertTrue(scell.isPartOfArrayFormulaGroup());
assertEquals(1, sheet.getNumMergedRegions()); assertEquals(1, sheet.getNumMergedRegions());
//we cannot merge cells included in an array formula workbook.close();
sheet.setArrayFormula("A1:A3*B1:B3", CellRangeAddress.valueOf("C1:C3")); }
CellRangeAddress cra = CellRangeAddress.valueOf("C1:C3");
@Test
public void testModifyArrayCells_mergeCellsMulti() throws IOException {
Workbook workbook = _testDataProvider.createWorkbook();
Sheet sheet = workbook.createSheet();
int expectedNumMergedRegions = 0;
assertEquals(expectedNumMergedRegions, sheet.getNumMergedRegions());
// we cannot merge cells included in an array formula
sheet.setArrayFormula("A1:A4*B1:B4", CellRangeAddress.valueOf("C2:F5"));
for (String ref : Arrays.asList(
"C2:F5", // identity
"D3:E4", "B1:G6", // contains
"B1:C2", "F1:G2", "F5:G6", "B5:C6", // 1x1 corner intersection
"B1:C6", "B1:G2", "F1:G6", "B5:G6", // 1-row/1-column intersection
"B1:D3", "E1:G3", "E4:G6", "B4:D6", // 2x2 corner intersection
"B1:D6", "B1:G3", "E1:G6", "B4:G6" // 2-row/2-column intersection
)) {
CellRangeAddress cra = CellRangeAddress.valueOf(ref);
try { try {
sheet.addMergedRegion(cra); sheet.addMergedRegion(cra);
fail("expected exception"); fail("expected exception with ref " + ref);
} catch (IllegalStateException e){ } catch (IllegalStateException e) {
String msg = "The range "+cra.formatAsString()+" intersects with a multi-cell array formula. You cannot merge cells of an array."; String msg = "The range "+cra.formatAsString()+" intersects with a multi-cell array formula. You cannot merge cells of an array.";
assertEquals(msg, e.getMessage()); assertEquals(msg, e.getMessage());
} }
}
//the number of merged regions remains the same //the number of merged regions remains the same
assertEquals(1, sheet.getNumMergedRegions()); assertEquals(expectedNumMergedRegions, sheet.getNumMergedRegions());
// we can merge non-intersecting cells
for (String ref : Arrays.asList(
"C1:F1", //above
"G2:G5", //right
"C6:F6", //bottom
"B2:B5", "H7:J9")) {
CellRangeAddress cra = CellRangeAddress.valueOf(ref);
try {
sheet.addMergedRegion(cra);
expectedNumMergedRegions++;
assertEquals(expectedNumMergedRegions, sheet.getNumMergedRegions());
} catch (IllegalStateException e) {
fail("did not expect exception with ref: " + ref + "\n" + e.getMessage());
}
}
workbook.close(); workbook.close();
} }