moparisthebest
/
poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

bug 56958: slightly improve performance when checking array formulas 

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

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

@ -735,15 +735,17 @@ public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {
}
private void validateArrayFormulas(CellRangeAddress region) {
// FIXME: this may be faster if it looped over array formulas directly rather than looping over each cell in
// the region and searching if that cell belongs to an array formula
int firstRow = region.getFirstRow();
int firstColumn = region.getFirstColumn();
int lastRow = region.getLastRow();
int lastColumn = region.getLastColumn();
for (int rowIn = firstRow; rowIn <= lastRow; rowIn++) {
HSSFRow row = getRow(rowIn);
if (row == null) continue;
for (int colIn = firstColumn; colIn <= lastColumn; colIn++) {
HSSFRow row = getRow(rowIn);
if (row == null) continue;
HSSFCell cell = row.getCell(colIn);
if (cell == null) continue;

14
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
View File

@ -379,21 +379,23 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
* @param region
* @throws IllegalStateException if candidate region intersects an existing array formula in this sheet
*/
private void validateArrayFormulas(CellRangeAddress region){
private void validateArrayFormulas(CellRangeAddress region) {
// FIXME: this may be faster if it looped over array formulas directly rather than looping over each cell in
// the region and searching if that cell belongs to an array formula
int firstRow = region.getFirstRow();
int firstColumn = region.getFirstColumn();
int lastRow = region.getLastRow();
int lastColumn = region.getLastColumn();
// for each cell in sheet, if cell belongs to an array formula, check if merged region intersects array formula cells
for (int rowIn = firstRow; rowIn <= lastRow; rowIn++) {
XSSFRow row = getRow(rowIn);
if (row == null) continue;
for (int colIn = firstColumn; colIn <= lastColumn; colIn++) {
XSSFRow row = getRow(rowIn);
if (row == null) continue;
XSSFCell cell = row.getCell(colIn);
if(cell == null) continue;
if (cell == null) continue;
if(cell.isPartOfArrayFormulaGroup()){
if (cell.isPartOfArrayFormulaGroup()) {
CellRangeAddress arrayRange = cell.getArrayFormulaRange();
if (arrayRange.getNumberOfCells() > 1 && region.intersects(arrayRange)) {
String msg = "The range " + region.formatAsString() + " intersects with a multi-cell array formula. " +