update indents
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1835482 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning
parent
7dc47ceefe
commit
6f3cc9ed80
@ -235,10 +235,10 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
for(RelationPart rp : getRelationParts()){
|
||||
POIXMLDocumentPart p = rp.getDocumentPart();
|
||||
if(p instanceof CommentsTable) {
|
||||
sheetComments = (CommentsTable)p;
|
||||
sheetComments = (CommentsTable)p;
|
||||
}
|
||||
if(p instanceof XSSFTable) {
|
||||
tables.put( rp.getRelationship().getId(), (XSSFTable)p );
|
||||
tables.put( rp.getRelationship().getId(), (XSSFTable)p );
|
||||
}
|
||||
if(p instanceof XSSFPivotTable) {
|
||||
getWorkbook().getPivotTables().add((XSSFPivotTable) p);
|
||||
@ -286,7 +286,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
|
||||
try {
|
||||
PackageRelationshipCollection hyperRels =
|
||||
getPackagePart().getRelationshipsByType(XSSFRelation.SHEET_HYPERLINKS.getRelation());
|
||||
getPackagePart().getRelationshipsByType(XSSFRelation.SHEET_HYPERLINKS.getRelation());
|
||||
|
||||
// Turn each one into a XSSFHyperlink
|
||||
for(CTHyperlink hyperlink : worksheet.getHyperlinks().getHyperlinkArray()) {
|
||||
@ -497,8 +497,8 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
for (final CellRangeAddress other : regions.subList(i+1, regions.size())) {
|
||||
if (region.intersects(other)) {
|
||||
String msg = "The range " + region.formatAsString() +
|
||||
" intersects with another merged region " +
|
||||
other.formatAsString() + " in this sheet";
|
||||
" intersects with another merged region " +
|
||||
other.formatAsString() + " in this sheet";
|
||||
throw new IllegalStateException(msg);
|
||||
}
|
||||
}
|
||||
@ -662,10 +662,10 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
}
|
||||
|
||||
protected CTDrawing getCTDrawing() {
|
||||
return worksheet.getDrawing();
|
||||
return worksheet.getDrawing();
|
||||
}
|
||||
protected CTLegacyDrawing getCTLegacyDrawing() {
|
||||
return worksheet.getLegacyDrawing();
|
||||
return worksheet.getLegacyDrawing();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -712,14 +712,14 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
assert(pane != null);
|
||||
|
||||
if (colSplit > 0) {
|
||||
pane.setXSplit(colSplit);
|
||||
pane.setXSplit(colSplit);
|
||||
} else if (pane.isSetXSplit()) {
|
||||
pane.unsetXSplit();
|
||||
pane.unsetXSplit();
|
||||
}
|
||||
if (rowSplit > 0) {
|
||||
pane.setYSplit(rowSplit);
|
||||
pane.setYSplit(rowSplit);
|
||||
} else if(pane.isSetYSplit()) {
|
||||
pane.unsetYSplit();
|
||||
pane.unsetYSplit();
|
||||
}
|
||||
|
||||
STPane.Enum activePane = STPane.BOTTOM_RIGHT;
|
||||
@ -991,8 +991,8 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
|
||||
private CTSheetFormatPr getSheetTypeSheetFormatPr() {
|
||||
return worksheet.isSetSheetFormatPr() ?
|
||||
worksheet.getSheetFormatPr() :
|
||||
worksheet.addNewSheetFormatPr();
|
||||
worksheet.getSheetFormatPr() :
|
||||
worksheet.addNewSheetFormatPr();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2055,15 +2055,15 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
CTCalcPr calcPr = getWorkbook().getCTWorkbook().getCalcPr();
|
||||
|
||||
if(worksheet.isSetSheetCalcPr()) {
|
||||
// Change the current setting
|
||||
CTSheetCalcPr calc = worksheet.getSheetCalcPr();
|
||||
calc.setFullCalcOnLoad(value);
|
||||
}
|
||||
else if(value) {
|
||||
// Add the Calc block and set it
|
||||
CTSheetCalcPr calc = worksheet.addNewSheetCalcPr();
|
||||
calc.setFullCalcOnLoad(value);
|
||||
}
|
||||
// Change the current setting
|
||||
CTSheetCalcPr calc = worksheet.getSheetCalcPr();
|
||||
calc.setFullCalcOnLoad(value);
|
||||
}
|
||||
else if(value) {
|
||||
// Add the Calc block and set it
|
||||
CTSheetCalcPr calc = worksheet.addNewSheetCalcPr();
|
||||
calc.setFullCalcOnLoad(value);
|
||||
}
|
||||
if(value && calcPr != null && calcPr.getCalcMode() == STCalcMode.MANUAL) {
|
||||
calcPr.setCalcMode(STCalcMode.AUTO);
|
||||
}
|
||||
@ -2076,11 +2076,11 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
*/
|
||||
@Override
|
||||
public boolean getForceFormulaRecalculation() {
|
||||
if(worksheet.isSetSheetCalcPr()) {
|
||||
CTSheetCalcPr calc = worksheet.getSheetCalcPr();
|
||||
return calc.getFullCalcOnLoad();
|
||||
}
|
||||
return false;
|
||||
if(worksheet.isSetSheetCalcPr()) {
|
||||
CTSheetCalcPr calc = worksheet.getSheetCalcPr();
|
||||
return calc.getFullCalcOnLoad();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2496,7 +2496,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
@Override
|
||||
public void setColumnHidden(int columnIndex, boolean hidden) {
|
||||
columnHelper.setColHidden(columnIndex, hidden);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the width (in units of 1/256th of a character width)
|
||||
@ -2533,7 +2533,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
* If you set a column width to be eight characters wide, e.g. <code>setColumnWidth(columnIndex, 8*256)</code>,
|
||||
* then the actual value of visible characters (the value shown in Excel) is derived from the following equation:
|
||||
* <code>
|
||||
Truncate([numChars*7+5]/7*256)/256 = 8;
|
||||
Truncate([numChars*7+5]/7*256)/256 = 8;
|
||||
* </code>
|
||||
*
|
||||
* which gives <code>7.29</code>.
|
||||
@ -2803,9 +2803,9 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
startHidden = false;
|
||||
} else {
|
||||
startLevel = getRow(startOfOutlineGroupIdx).getCTRow()
|
||||
.getOutlineLevel();
|
||||
.getOutlineLevel();
|
||||
startHidden = getRow(startOfOutlineGroupIdx).getCTRow()
|
||||
.getHidden();
|
||||
.getHidden();
|
||||
}
|
||||
if (endLevel > startLevel) {
|
||||
return endHidden;
|
||||
@ -2889,10 +2889,10 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
final Row curRow = srcRows.get(index);
|
||||
if (curRow == null) {
|
||||
throw new IllegalArgumentException("srcRows may not contain null rows. Found null row at index " + index + ".");
|
||||
//} else if (curRow.getRowNum() != prevRow.getRowNum() + 1) {
|
||||
// throw new IllegalArgumentException("srcRows must contain continuously increasing row numbers. " +
|
||||
// "Got srcRows[" + (index-1) + "]=Row " + prevRow.getRowNum() + ", srcRows[" + index + "]=Row " + curRow.getRowNum() + ".");
|
||||
// FIXME: assumes row objects belong to non-null sheets and sheets belong to non-null workbooks.
|
||||
//} else if (curRow.getRowNum() != prevRow.getRowNum() + 1) {
|
||||
// throw new IllegalArgumentException("srcRows must contain continuously increasing row numbers. " +
|
||||
// "Got srcRows[" + (index-1) + "]=Row " + prevRow.getRowNum() + ", srcRows[" + index + "]=Row " + curRow.getRowNum() + ".");
|
||||
// FIXME: assumes row objects belong to non-null sheets and sheets belong to non-null workbooks.
|
||||
} else if (srcStartRow.getSheet().getWorkbook() != curRow.getSheet().getWorkbook()) {
|
||||
throw new IllegalArgumentException("All rows in srcRows must belong to the same sheet in the same workbook." +
|
||||
"Expected all rows from same workbook (" + srcStartRow.getSheet().getWorkbook() + "). " +
|
||||
@ -3007,7 +3007,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
int sheetIndex = getWorkbook().getSheetIndex(this);
|
||||
String sheetName = getWorkbook().getSheetName(sheetIndex);
|
||||
FormulaShifter formulaShifter = FormulaShifter.createForRowShift(
|
||||
sheetIndex, sheetName, startRow, endRow, n, SpreadsheetVersion.EXCEL2007);
|
||||
sheetIndex, sheetName, startRow, endRow, n, SpreadsheetVersion.EXCEL2007);
|
||||
removeOverwritten(vml, startRow, endRow, n);
|
||||
shiftCommentsAndRows(vml, startRow, endRow, n);
|
||||
|
||||
@ -3018,15 +3018,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
rowShifter.updateConditionalFormatting(formulaShifter);
|
||||
rowShifter.updateHyperlinks(formulaShifter);
|
||||
|
||||
//rebuild the _rows map
|
||||
Map<Integer, XSSFRow> map = new HashMap<>();
|
||||
for(XSSFRow r : _rows.values()) {
|
||||
// Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
|
||||
final Integer rownumI = new Integer(r.getRowNum()); // NOSONAR
|
||||
map.put(rownumI, r);
|
||||
}
|
||||
_rows.clear();
|
||||
_rows.putAll(map);
|
||||
rebuildRows();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -3051,18 +3043,22 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
columnShifter.updateHyperlinks(formulaShifter);
|
||||
columnShifter.updateNamedRanges(formulaShifter);
|
||||
|
||||
rebuildRows();
|
||||
}
|
||||
|
||||
private final void rebuildRows() {
|
||||
//rebuild the _rows map
|
||||
Map<Integer, XSSFRow> map = new HashMap<>();
|
||||
for(XSSFRow r : _rows.values()) {
|
||||
final Integer rownumI = new Integer(r.getRowNum()); // NOSONAR
|
||||
map.put(rownumI, r);
|
||||
}
|
||||
List<XSSFRow> rowList = new ArrayList<>(_rows.values());
|
||||
_rows.clear();
|
||||
_rows.putAll(map);
|
||||
for(XSSFRow r : rowList) {
|
||||
// Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
|
||||
final Integer rownumI = new Integer(r.getRowNum()); // NOSONAR
|
||||
_rows.put(rownumI, r);
|
||||
}
|
||||
}
|
||||
|
||||
// remove all rows which will be overwritten
|
||||
private void removeOverwritten(XSSFVMLDrawing vml, int startRow, int endRow, final int n){
|
||||
private void removeOverwritten(XSSFVMLDrawing vml, int startRow, int endRow, final int n){
|
||||
for (Iterator<Row> it = rowIterator() ; it.hasNext() ; ) {
|
||||
XSSFRow row = (XSSFRow)it.next();
|
||||
int rownum = row.getRowNum();
|
||||
@ -3109,81 +3105,81 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
}
|
||||
|
||||
private void shiftCommentsAndRows(XSSFVMLDrawing vml, int startRow, int endRow, final int n){
|
||||
// then do the actual moving and also adjust comments/rowHeight
|
||||
// we need to sort it in a way so the shifting does not mess up the structures,
|
||||
// i.e. when shifting down, start from down and go up, when shifting up, vice-versa
|
||||
SortedMap<XSSFComment, Integer> commentsToShift = new TreeMap<>(new Comparator<XSSFComment>() {
|
||||
@Override
|
||||
public int compare(XSSFComment o1, XSSFComment o2) {
|
||||
int row1 = o1.getRow();
|
||||
int row2 = o2.getRow();
|
||||
// then do the actual moving and also adjust comments/rowHeight
|
||||
// we need to sort it in a way so the shifting does not mess up the structures,
|
||||
// i.e. when shifting down, start from down and go up, when shifting up, vice-versa
|
||||
SortedMap<XSSFComment, Integer> commentsToShift = new TreeMap<>(new Comparator<XSSFComment>() {
|
||||
@Override
|
||||
public int compare(XSSFComment o1, XSSFComment o2) {
|
||||
int row1 = o1.getRow();
|
||||
int row2 = o2.getRow();
|
||||
|
||||
if (row1 == row2) {
|
||||
// ordering is not important when row is equal, but don't return zero to still
|
||||
// get multiple comments per row into the map
|
||||
return o1.hashCode() - o2.hashCode();
|
||||
}
|
||||
if (row1 == row2) {
|
||||
// ordering is not important when row is equal, but don't return zero to still
|
||||
// get multiple comments per row into the map
|
||||
return o1.hashCode() - o2.hashCode();
|
||||
}
|
||||
|
||||
// when shifting down, sort higher row-values first
|
||||
if (n > 0) {
|
||||
return row1 < row2 ? 1 : -1;
|
||||
} else {
|
||||
// sort lower-row values first when shifting up
|
||||
return row1 > row2 ? 1 : -1;
|
||||
}
|
||||
}
|
||||
});
|
||||
// when shifting down, sort higher row-values first
|
||||
if (n > 0) {
|
||||
return row1 < row2 ? 1 : -1;
|
||||
} else {
|
||||
// sort lower-row values first when shifting up
|
||||
return row1 > row2 ? 1 : -1;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
for (Iterator<Row> it = rowIterator() ; it.hasNext() ; ) {
|
||||
XSSFRow row = (XSSFRow)it.next();
|
||||
int rownum = row.getRowNum();
|
||||
for (Iterator<Row> it = rowIterator() ; it.hasNext() ; ) {
|
||||
XSSFRow row = (XSSFRow)it.next();
|
||||
int rownum = row.getRowNum();
|
||||
|
||||
if(sheetComments != null){
|
||||
// calculate the new rownum
|
||||
int newrownum = shiftedRowNum(startRow, endRow, n, rownum);
|
||||
if(sheetComments != null){
|
||||
// calculate the new rownum
|
||||
int newrownum = shiftedRowNum(startRow, endRow, n, rownum);
|
||||
|
||||
// is there a change necessary for the current row?
|
||||
if(newrownum != rownum) {
|
||||
CTCommentList lst = sheetComments.getCTComments().getCommentList();
|
||||
for (CTComment comment : lst.getCommentArray()) {
|
||||
String oldRef = comment.getRef();
|
||||
CellReference ref = new CellReference(oldRef);
|
||||
// is there a change necessary for the current row?
|
||||
if(newrownum != rownum) {
|
||||
CTCommentList lst = sheetComments.getCTComments().getCommentList();
|
||||
for (CTComment comment : lst.getCommentArray()) {
|
||||
String oldRef = comment.getRef();
|
||||
CellReference ref = new CellReference(oldRef);
|
||||
|
||||
// is this comment part of the current row?
|
||||
if(ref.getRow() == rownum) {
|
||||
XSSFComment xssfComment = new XSSFComment(sheetComments, comment,
|
||||
vml == null ? null : vml.findCommentShape(rownum, ref.getCol()));
|
||||
// is this comment part of the current row?
|
||||
if(ref.getRow() == rownum) {
|
||||
XSSFComment xssfComment = new XSSFComment(sheetComments, comment,
|
||||
vml == null ? null : vml.findCommentShape(rownum, ref.getCol()));
|
||||
|
||||
// we should not perform the shifting right here as we would then find
|
||||
// already shifted comments and would shift them again...
|
||||
commentsToShift.put(xssfComment, newrownum);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// we should not perform the shifting right here as we would then find
|
||||
// already shifted comments and would shift them again...
|
||||
commentsToShift.put(xssfComment, newrownum);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(rownum < startRow || rownum > endRow) {
|
||||
continue;
|
||||
}
|
||||
row.shift(n);
|
||||
}
|
||||
// adjust all the affected comment-structures now
|
||||
// the Map is sorted and thus provides them in the order that we need here,
|
||||
// i.e. from down to up if shifting down, vice-versa otherwise
|
||||
for(Map.Entry<XSSFComment, Integer> entry : commentsToShift.entrySet()) {
|
||||
entry.getKey().setRow(entry.getValue());
|
||||
}
|
||||
if(rownum < startRow || rownum > endRow) {
|
||||
continue;
|
||||
}
|
||||
row.shift(n);
|
||||
}
|
||||
// adjust all the affected comment-structures now
|
||||
// the Map is sorted and thus provides them in the order that we need here,
|
||||
// i.e. from down to up if shifting down, vice-versa otherwise
|
||||
for(Map.Entry<XSSFComment, Integer> entry : commentsToShift.entrySet()) {
|
||||
entry.getKey().setRow(entry.getValue());
|
||||
}
|
||||
|
||||
//rebuild the _rows map
|
||||
Map<Integer, XSSFRow> map = new HashMap<>();
|
||||
for(XSSFRow r : _rows.values()) {
|
||||
// Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
|
||||
final Integer rownumI = Integer.valueOf(r.getRowNum()); // NOSONAR
|
||||
map.put(rownumI, r);
|
||||
}
|
||||
_rows.clear();
|
||||
_rows.putAll(map);
|
||||
//rebuild the _rows map
|
||||
Map<Integer, XSSFRow> map = new HashMap<>();
|
||||
for(XSSFRow r : _rows.values()) {
|
||||
// Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
|
||||
final Integer rownumI = Integer.valueOf(r.getRowNum()); // NOSONAR
|
||||
map.put(rownumI, r);
|
||||
}
|
||||
_rows.clear();
|
||||
_rows.putAll(map);
|
||||
|
||||
}
|
||||
private int shiftedRowNum(int startRow, int endRow, int n, int rownum) {
|
||||
@ -3249,7 +3245,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
int newColumnIndex = shiftedRowNum(startColumnIndex, endColumnIndex, n, columnIndex);
|
||||
if(newColumnIndex != columnIndex){
|
||||
XSSFComment xssfComment = new XSSFComment(sheetComments, comment,
|
||||
vml == null ? null : vml.findCommentShape(ref.getRow(), columnIndex));
|
||||
vml == null ? null : vml.findCommentShape(ref.getRow(), columnIndex));
|
||||
commentsToShift.put(xssfComment, newColumnIndex);
|
||||
}
|
||||
}
|
||||
@ -3499,18 +3495,18 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
*/
|
||||
protected CommentsTable getCommentsTable(boolean create) {
|
||||
if(sheetComments == null && create){
|
||||
// Try to create a comments table with the same number as
|
||||
// the sheet has (i.e. sheet 1 -> comments 1)
|
||||
try {
|
||||
sheetComments = (CommentsTable)createRelationship(
|
||||
XSSFRelation.SHEET_COMMENTS, XSSFFactory.getInstance(), (int)sheet.getSheetId());
|
||||
} catch(PartAlreadyExistsException e) {
|
||||
// Technically a sheet doesn't need the same number as
|
||||
// it's comments, and clearly someone has already pinched
|
||||
// our number! Go for the next available one instead
|
||||
sheetComments = (CommentsTable)createRelationship(
|
||||
XSSFRelation.SHEET_COMMENTS, XSSFFactory.getInstance(), -1);
|
||||
}
|
||||
// Try to create a comments table with the same number as
|
||||
// the sheet has (i.e. sheet 1 -> comments 1)
|
||||
try {
|
||||
sheetComments = (CommentsTable)createRelationship(
|
||||
XSSFRelation.SHEET_COMMENTS, XSSFFactory.getInstance(), (int)sheet.getSheetId());
|
||||
} catch(PartAlreadyExistsException e) {
|
||||
// Technically a sheet doesn't need the same number as
|
||||
// it's comments, and clearly someone has already pinched
|
||||
// our number! Go for the next available one instead
|
||||
sheetComments = (CommentsTable)createRelationship(
|
||||
XSSFRelation.SHEET_COMMENTS, XSSFFactory.getInstance(), -1);
|
||||
}
|
||||
}
|
||||
return sheetComments;
|
||||
}
|
||||
@ -4215,99 +4211,99 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
|
||||
@Override
|
||||
public CellRangeAddress getRepeatingRows() {
|
||||
return getRepeatingRowsOrColums(true);
|
||||
return getRepeatingRowsOrColums(true);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public CellRangeAddress getRepeatingColumns() {
|
||||
return getRepeatingRowsOrColums(false);
|
||||
return getRepeatingRowsOrColums(false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRepeatingRows(CellRangeAddress rowRangeRef) {
|
||||
CellRangeAddress columnRangeRef = getRepeatingColumns();
|
||||
setRepeatingRowsAndColumns(rowRangeRef, columnRangeRef);
|
||||
CellRangeAddress columnRangeRef = getRepeatingColumns();
|
||||
setRepeatingRowsAndColumns(rowRangeRef, columnRangeRef);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setRepeatingColumns(CellRangeAddress columnRangeRef) {
|
||||
CellRangeAddress rowRangeRef = getRepeatingRows();
|
||||
setRepeatingRowsAndColumns(rowRangeRef, columnRangeRef);
|
||||
CellRangeAddress rowRangeRef = getRepeatingRows();
|
||||
setRepeatingRowsAndColumns(rowRangeRef, columnRangeRef);
|
||||
}
|
||||
|
||||
|
||||
private void setRepeatingRowsAndColumns(
|
||||
CellRangeAddress rowDef, CellRangeAddress colDef) {
|
||||
int col1 = -1;
|
||||
int col2 = -1;
|
||||
int row1 = -1;
|
||||
int row2 = -1;
|
||||
CellRangeAddress rowDef, CellRangeAddress colDef) {
|
||||
int col1 = -1;
|
||||
int col2 = -1;
|
||||
int row1 = -1;
|
||||
int row2 = -1;
|
||||
|
||||
if (rowDef != null) {
|
||||
row1 = rowDef.getFirstRow();
|
||||
row2 = rowDef.getLastRow();
|
||||
if ((row1 == -1 && row2 != -1)
|
||||
|| row1 < -1 || row2 < -1 || row1 > row2) {
|
||||
throw new IllegalArgumentException("Invalid row range specification");
|
||||
if (rowDef != null) {
|
||||
row1 = rowDef.getFirstRow();
|
||||
row2 = rowDef.getLastRow();
|
||||
if ((row1 == -1 && row2 != -1)
|
||||
|| row1 < -1 || row2 < -1 || row1 > row2) {
|
||||
throw new IllegalArgumentException("Invalid row range specification");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (colDef != null) {
|
||||
col1 = colDef.getFirstColumn();
|
||||
col2 = colDef.getLastColumn();
|
||||
if ((col1 == -1 && col2 != -1)
|
||||
|| col1 < -1 || col2 < -1 || col1 > col2) {
|
||||
throw new IllegalArgumentException(
|
||||
"Invalid column range specification");
|
||||
if (colDef != null) {
|
||||
col1 = colDef.getFirstColumn();
|
||||
col2 = colDef.getLastColumn();
|
||||
if ((col1 == -1 && col2 != -1)
|
||||
|| col1 < -1 || col2 < -1 || col1 > col2) {
|
||||
throw new IllegalArgumentException(
|
||||
"Invalid column range specification");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int sheetIndex = getWorkbook().getSheetIndex(this);
|
||||
int sheetIndex = getWorkbook().getSheetIndex(this);
|
||||
|
||||
boolean removeAll = rowDef == null && colDef == null;
|
||||
boolean removeAll = rowDef == null && colDef == null;
|
||||
|
||||
XSSFName name = getWorkbook().getBuiltInName(
|
||||
XSSFName.BUILTIN_PRINT_TITLE, sheetIndex);
|
||||
if (removeAll) {
|
||||
if (name != null) {
|
||||
getWorkbook().removeName(name);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (name == null) {
|
||||
name = getWorkbook().createBuiltInName(
|
||||
XSSFName.BUILTIN_PRINT_TITLE, sheetIndex);
|
||||
}
|
||||
XSSFName name = getWorkbook().getBuiltInName(
|
||||
XSSFName.BUILTIN_PRINT_TITLE, sheetIndex);
|
||||
if (removeAll) {
|
||||
if (name != null) {
|
||||
getWorkbook().removeName(name);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (name == null) {
|
||||
name = getWorkbook().createBuiltInName(
|
||||
XSSFName.BUILTIN_PRINT_TITLE, sheetIndex);
|
||||
}
|
||||
|
||||
String reference = getReferenceBuiltInRecord(
|
||||
name.getSheetName(), col1, col2, row1, row2);
|
||||
name.setRefersToFormula(reference);
|
||||
String reference = getReferenceBuiltInRecord(
|
||||
name.getSheetName(), col1, col2, row1, row2);
|
||||
name.setRefersToFormula(reference);
|
||||
|
||||
// If the print setup isn't currently defined, then add it
|
||||
// in but without printer defaults
|
||||
// If it's already there, leave it as-is!
|
||||
if (worksheet.isSetPageSetup() && worksheet.isSetPageMargins()) {
|
||||
// Everything we need is already there
|
||||
} else {
|
||||
// Have initial ones put in place
|
||||
getPrintSetup().setValidSettings(false);
|
||||
}
|
||||
// If the print setup isn't currently defined, then add it
|
||||
// in but without printer defaults
|
||||
// If it's already there, leave it as-is!
|
||||
if (worksheet.isSetPageSetup() && worksheet.isSetPageMargins()) {
|
||||
// Everything we need is already there
|
||||
} else {
|
||||
// Have initial ones put in place
|
||||
getPrintSetup().setValidSettings(false);
|
||||
}
|
||||
}
|
||||
|
||||
private static String getReferenceBuiltInRecord(
|
||||
String sheetName, int startC, int endC, int startR, int endR) {
|
||||
String sheetName, int startC, int endC, int startR, int endR) {
|
||||
// Excel example for built-in title:
|
||||
// 'second sheet'!$E:$F,'second sheet'!$2:$3
|
||||
|
||||
CellReference colRef =
|
||||
new CellReference(sheetName, 0, startC, true, true);
|
||||
new CellReference(sheetName, 0, startC, true, true);
|
||||
CellReference colRef2 =
|
||||
new CellReference(sheetName, 0, endC, true, true);
|
||||
new CellReference(sheetName, 0, endC, true, true);
|
||||
CellReference rowRef =
|
||||
new CellReference(sheetName, startR, 0, true, true);
|
||||
new CellReference(sheetName, startR, 0, true, true);
|
||||
CellReference rowRef2 =
|
||||
new CellReference(sheetName, endR, 0, true, true);
|
||||
new CellReference(sheetName, endR, 0, true, true);
|
||||
|
||||
String escapedName = SheetNameFormatter.format(sheetName);
|
||||
|
||||
@ -4315,23 +4311,23 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
String r = "";
|
||||
|
||||
if (startC != -1 || endC != -1) {
|
||||
String col1 = colRef.getCellRefParts()[2];
|
||||
String col2 = colRef2.getCellRefParts()[2];
|
||||
c = escapedName + "!$" + col1 + ":$" + col2;
|
||||
String col1 = colRef.getCellRefParts()[2];
|
||||
String col2 = colRef2.getCellRefParts()[2];
|
||||
c = escapedName + "!$" + col1 + ":$" + col2;
|
||||
}
|
||||
|
||||
if (startR != -1 || endR != -1) {
|
||||
String row1 = rowRef.getCellRefParts()[1];
|
||||
String row2 = rowRef2.getCellRefParts()[1];
|
||||
if (!row1.equals("0") && !row2.equals("0")) {
|
||||
r = escapedName + "!$" + row1 + ":$" + row2;
|
||||
r = escapedName + "!$" + row1 + ":$" + row2;
|
||||
}
|
||||
}
|
||||
|
||||
StringBuilder rng = new StringBuilder();
|
||||
rng.append(c);
|
||||
if(rng.length() > 0 && r.length() > 0) {
|
||||
rng.append(',');
|
||||
rng.append(',');
|
||||
}
|
||||
rng.append(r);
|
||||
return rng.toString();
|
||||
@ -4339,38 +4335,38 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
|
||||
|
||||
private CellRangeAddress getRepeatingRowsOrColums(boolean rows) {
|
||||
int sheetIndex = getWorkbook().getSheetIndex(this);
|
||||
XSSFName name = getWorkbook().getBuiltInName(
|
||||
XSSFName.BUILTIN_PRINT_TITLE, sheetIndex);
|
||||
if (name == null ) {
|
||||
return null;
|
||||
}
|
||||
String refStr = name.getRefersToFormula();
|
||||
if (refStr == null) {
|
||||
return null;
|
||||
}
|
||||
String[] parts = refStr.split(",");
|
||||
int maxRowIndex = SpreadsheetVersion.EXCEL2007.getLastRowIndex();
|
||||
int maxColIndex = SpreadsheetVersion.EXCEL2007.getLastColumnIndex();
|
||||
for (String part : parts) {
|
||||
CellRangeAddress range = CellRangeAddress.valueOf(part);
|
||||
if ((range.getFirstColumn() == 0
|
||||
&& range.getLastColumn() == maxColIndex)
|
||||
|| (range.getFirstColumn() == -1
|
||||
&& range.getLastColumn() == -1)) {
|
||||
if (rows) {
|
||||
return range;
|
||||
}
|
||||
} else if (range.getFirstRow() == 0
|
||||
&& range.getLastRow() == maxRowIndex
|
||||
|| (range.getFirstRow() == -1
|
||||
&& range.getLastRow() == -1)) {
|
||||
if (!rows) {
|
||||
return range;
|
||||
}
|
||||
int sheetIndex = getWorkbook().getSheetIndex(this);
|
||||
XSSFName name = getWorkbook().getBuiltInName(
|
||||
XSSFName.BUILTIN_PRINT_TITLE, sheetIndex);
|
||||
if (name == null ) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
String refStr = name.getRefersToFormula();
|
||||
if (refStr == null) {
|
||||
return null;
|
||||
}
|
||||
String[] parts = refStr.split(",");
|
||||
int maxRowIndex = SpreadsheetVersion.EXCEL2007.getLastRowIndex();
|
||||
int maxColIndex = SpreadsheetVersion.EXCEL2007.getLastColumnIndex();
|
||||
for (String part : parts) {
|
||||
CellRangeAddress range = CellRangeAddress.valueOf(part);
|
||||
if ((range.getFirstColumn() == 0
|
||||
&& range.getLastColumn() == maxColIndex)
|
||||
|| (range.getFirstColumn() == -1
|
||||
&& range.getLastColumn() == -1)) {
|
||||
if (rows) {
|
||||
return range;
|
||||
}
|
||||
} else if (range.getFirstRow() == 0
|
||||
&& range.getLastRow() == maxRowIndex
|
||||
|| (range.getFirstRow() == -1
|
||||
&& range.getLastRow() == -1)) {
|
||||
if (!rows) {
|
||||
return range;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -4434,19 +4430,19 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
}
|
||||
|
||||
return createPivotTable(position, sourceSheet, new PivotTableReferenceConfigurator() {
|
||||
@Override
|
||||
public void configureReference(CTWorksheetSource wsSource) {
|
||||
final String[] firstCell = source.getFirstCell().getCellRefParts();
|
||||
final String firstRow = firstCell[1];
|
||||
final String firstCol = firstCell[2];
|
||||
final String[] lastCell = source.getLastCell().getCellRefParts();
|
||||
final String lastRow = lastCell[1];
|
||||
final String lastCol = lastCell[2];
|
||||
final String ref = firstCol+firstRow+':'+lastCol+lastRow; //or just source.formatAsString()
|
||||
wsSource.setRef(ref);
|
||||
}
|
||||
});
|
||||
}
|
||||
@Override
|
||||
public void configureReference(CTWorksheetSource wsSource) {
|
||||
final String[] firstCell = source.getFirstCell().getCellRefParts();
|
||||
final String firstRow = firstCell[1];
|
||||
final String firstCol = firstCell[2];
|
||||
final String[] lastCell = source.getLastCell().getCellRefParts();
|
||||
final String lastRow = lastCell[1];
|
||||
final String lastCol = lastCell[2];
|
||||
final String ref = firstCol+firstRow+':'+lastCol+lastRow; //or just source.formatAsString()
|
||||
wsSource.setRef(ref);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a pivot table using the AreaReference or named/table range on sourceSheet, at the given position.
|
||||
@ -4507,12 +4503,12 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
}
|
||||
|
||||
return createPivotTable(position, sourceSheet, new PivotTableReferenceConfigurator() {
|
||||
@Override
|
||||
public void configureReference(CTWorksheetSource wsSource) {
|
||||
wsSource.setName(source.getNameName());
|
||||
}
|
||||
});
|
||||
}
|
||||
@Override
|
||||
public void configureReference(CTWorksheetSource wsSource) {
|
||||
wsSource.setName(source.getNameName());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a pivot table using the Name range, at the given position.
|
||||
@ -4535,12 +4531,12 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
|
||||
*/
|
||||
@Beta
|
||||
public XSSFPivotTable createPivotTable(final Table source, CellReference position) {
|
||||
return createPivotTable(position, getWorkbook().getSheet(source.getSheetName()), new PivotTableReferenceConfigurator() {
|
||||
@Override
|
||||
public void configureReference(CTWorksheetSource wsSource) {
|
||||
wsSource.setName(source.getName());
|
||||
}
|
||||
});
|
||||
return createPivotTable(position, getWorkbook().getSheet(source.getSheetName()), new PivotTableReferenceConfigurator() {
|
||||
@Override
|
||||
public void configureReference(CTWorksheetSource wsSource) {
|
||||
wsSource.setName(source.getName());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -148,15 +148,15 @@ public final class TestUnfixedBugs {
|
||||
int dayAdjust = -1; // Excel thinks 2/29/1900 is a valid date, which it isn't
|
||||
Calendar calendar1 = LocaleUtil.getLocaleCalendar(startYear,0, wholeDays1 + dayAdjust);
|
||||
calendar1.set(Calendar.MILLISECOND, millisecondsInDay1);
|
||||
// this is the rounding part:
|
||||
calendar1.add(Calendar.MILLISECOND, 500);
|
||||
calendar1.clear(Calendar.MILLISECOND);
|
||||
// this is the rounding part:
|
||||
calendar1.add(Calendar.MILLISECOND, 500);
|
||||
calendar1.clear(Calendar.MILLISECOND);
|
||||
|
||||
Calendar calendar2 = LocaleUtil.getLocaleCalendar(startYear,0, wholeDays2 + dayAdjust);
|
||||
calendar2.set(Calendar.MILLISECOND, millisecondsInDay2);
|
||||
// this is the rounding part:
|
||||
calendar2.add(Calendar.MILLISECOND, 500);
|
||||
calendar2.clear(Calendar.MILLISECOND);
|
||||
// this is the rounding part:
|
||||
calendar2.add(Calendar.MILLISECOND, 500);
|
||||
calendar2.clear(Calendar.MILLISECOND);
|
||||
|
||||
// now the calendars are equal
|
||||
assertEquals(calendar1, calendar2);
|
||||
@ -195,156 +195,156 @@ public final class TestUnfixedBugs {
|
||||
wbBack.close();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBug55752() throws IOException {
|
||||
Workbook wb = new XSSFWorkbook();
|
||||
try {
|
||||
Sheet sheet = wb.createSheet("test");
|
||||
@Test
|
||||
public void testBug55752() throws IOException {
|
||||
Workbook wb = new XSSFWorkbook();
|
||||
try {
|
||||
Sheet sheet = wb.createSheet("test");
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
Row row = sheet.createRow(i);
|
||||
for (int j = 0; j < 2; j++) {
|
||||
Cell cell = row.createCell(j);
|
||||
cell.setCellStyle(wb.createCellStyle());
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < 4; i++) {
|
||||
Row row = sheet.createRow(i);
|
||||
for (int j = 0; j < 2; j++) {
|
||||
Cell cell = row.createCell(j);
|
||||
cell.setCellStyle(wb.createCellStyle());
|
||||
}
|
||||
}
|
||||
|
||||
// set content
|
||||
Row row1 = sheet.getRow(0);
|
||||
row1.getCell(0).setCellValue("AAA");
|
||||
Row row2 = sheet.getRow(1);
|
||||
row2.getCell(0).setCellValue("BBB");
|
||||
Row row3 = sheet.getRow(2);
|
||||
row3.getCell(0).setCellValue("CCC");
|
||||
Row row4 = sheet.getRow(3);
|
||||
row4.getCell(0).setCellValue("DDD");
|
||||
// set content
|
||||
Row row1 = sheet.getRow(0);
|
||||
row1.getCell(0).setCellValue("AAA");
|
||||
Row row2 = sheet.getRow(1);
|
||||
row2.getCell(0).setCellValue("BBB");
|
||||
Row row3 = sheet.getRow(2);
|
||||
row3.getCell(0).setCellValue("CCC");
|
||||
Row row4 = sheet.getRow(3);
|
||||
row4.getCell(0).setCellValue("DDD");
|
||||
|
||||
// merge cells
|
||||
CellRangeAddress range1 = new CellRangeAddress(0, 0, 0, 1);
|
||||
sheet.addMergedRegion(range1);
|
||||
CellRangeAddress range2 = new CellRangeAddress(1, 1, 0, 1);
|
||||
sheet.addMergedRegion(range2);
|
||||
CellRangeAddress range3 = new CellRangeAddress(2, 2, 0, 1);
|
||||
sheet.addMergedRegion(range3);
|
||||
assertEquals(0, range3.getFirstColumn());
|
||||
assertEquals(1, range3.getLastColumn());
|
||||
assertEquals(2, range3.getLastRow());
|
||||
CellRangeAddress range4 = new CellRangeAddress(3, 3, 0, 1);
|
||||
sheet.addMergedRegion(range4);
|
||||
// merge cells
|
||||
CellRangeAddress range1 = new CellRangeAddress(0, 0, 0, 1);
|
||||
sheet.addMergedRegion(range1);
|
||||
CellRangeAddress range2 = new CellRangeAddress(1, 1, 0, 1);
|
||||
sheet.addMergedRegion(range2);
|
||||
CellRangeAddress range3 = new CellRangeAddress(2, 2, 0, 1);
|
||||
sheet.addMergedRegion(range3);
|
||||
assertEquals(0, range3.getFirstColumn());
|
||||
assertEquals(1, range3.getLastColumn());
|
||||
assertEquals(2, range3.getLastRow());
|
||||
CellRangeAddress range4 = new CellRangeAddress(3, 3, 0, 1);
|
||||
sheet.addMergedRegion(range4);
|
||||
|
||||
// set border
|
||||
RegionUtil.setBorderBottom(BorderStyle.THIN, range1, sheet);
|
||||
// set border
|
||||
RegionUtil.setBorderBottom(BorderStyle.THIN, range1, sheet);
|
||||
|
||||
row2.getCell(0).getCellStyle().setBorderBottom(BorderStyle.THIN);
|
||||
row2.getCell(1).getCellStyle().setBorderBottom(BorderStyle.THIN);
|
||||
row2.getCell(0).getCellStyle().setBorderBottom(BorderStyle.THIN);
|
||||
row2.getCell(1).getCellStyle().setBorderBottom(BorderStyle.THIN);
|
||||
|
||||
Cell cell0 = CellUtil.getCell(row3, 0);
|
||||
CellUtil.setCellStyleProperty(cell0, CellUtil.BORDER_BOTTOM, BorderStyle.THIN);
|
||||
Cell cell1 = CellUtil.getCell(row3, 1);
|
||||
CellUtil.setCellStyleProperty(cell1, CellUtil.BORDER_BOTTOM, BorderStyle.THIN);
|
||||
Cell cell0 = CellUtil.getCell(row3, 0);
|
||||
CellUtil.setCellStyleProperty(cell0, CellUtil.BORDER_BOTTOM, BorderStyle.THIN);
|
||||
Cell cell1 = CellUtil.getCell(row3, 1);
|
||||
CellUtil.setCellStyleProperty(cell1, CellUtil.BORDER_BOTTOM, BorderStyle.THIN);
|
||||
|
||||
RegionUtil.setBorderBottom(BorderStyle.THIN, range4, sheet);
|
||||
RegionUtil.setBorderBottom(BorderStyle.THIN, range4, sheet);
|
||||
|
||||
// write to file for manual inspection
|
||||
XSSFTestDataSamples.writeOut(wb, "bug 55752 for review");
|
||||
} finally {
|
||||
wb.close();
|
||||
}
|
||||
}
|
||||
// write to file for manual inspection
|
||||
XSSFTestDataSamples.writeOut(wb, "bug 55752 for review");
|
||||
} finally {
|
||||
wb.close();
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test57423() throws IOException {
|
||||
Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57423.xlsx");
|
||||
@Test
|
||||
public void test57423() throws IOException {
|
||||
Workbook wb = XSSFTestDataSamples.openSampleWorkbook("57423.xlsx");
|
||||
|
||||
Sheet testSheet = wb.getSheetAt(0);
|
||||
Sheet testSheet = wb.getSheetAt(0);
|
||||
|
||||
// row shift (negative or positive) causes corrupted output xlsx file when the shift value is bigger
|
||||
// than the number of rows being shifted
|
||||
// Excel 2010 on opening the output file says:
|
||||
// "Excel found unreadable content" and offers recovering the file by removing the unreadable content
|
||||
// This can be observed in cases like the following:
|
||||
// negative shift of 1 row by less than -1
|
||||
// negative shift of 2 rows by less than -2
|
||||
// positive shift of 1 row by 2 or more
|
||||
// positive shift of 2 rows by 3 or more
|
||||
// row shift (negative or positive) causes corrupted output xlsx file when the shift value is bigger
|
||||
// than the number of rows being shifted
|
||||
// Excel 2010 on opening the output file says:
|
||||
// "Excel found unreadable content" and offers recovering the file by removing the unreadable content
|
||||
// This can be observed in cases like the following:
|
||||
// negative shift of 1 row by less than -1
|
||||
// negative shift of 2 rows by less than -2
|
||||
// positive shift of 1 row by 2 or more
|
||||
// positive shift of 2 rows by 3 or more
|
||||
|
||||
//testSheet.shiftRows(4, 5, -3);
|
||||
testSheet.shiftRows(10, 10, 2);
|
||||
//testSheet.shiftRows(4, 5, -3);
|
||||
testSheet.shiftRows(10, 10, 2);
|
||||
|
||||
checkRows57423(testSheet);
|
||||
checkRows57423(testSheet);
|
||||
|
||||
Workbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
|
||||
/* XSSFTestDataSamples.writeOut(wb, "bug 57423 for manual review"); */
|
||||
Workbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb);
|
||||
/* XSSFTestDataSamples.writeOut(wb, "bug 57423 for manual review"); */
|
||||
|
||||
wb.close();
|
||||
wb.close();
|
||||
|
||||
checkRows57423(wbBack.getSheetAt(0));
|
||||
checkRows57423(wbBack.getSheetAt(0));
|
||||
|
||||
wbBack.close();
|
||||
}
|
||||
wbBack.close();
|
||||
}
|
||||
|
||||
private void checkRows57423(Sheet testSheet) throws IOException {
|
||||
checkRow57423(testSheet, 0, "0");
|
||||
checkRow57423(testSheet, 1, "1");
|
||||
checkRow57423(testSheet, 2, "2");
|
||||
checkRow57423(testSheet, 3, "3");
|
||||
checkRow57423(testSheet, 4, "4");
|
||||
checkRow57423(testSheet, 5, "5");
|
||||
checkRow57423(testSheet, 6, "6");
|
||||
checkRow57423(testSheet, 7, "7");
|
||||
checkRow57423(testSheet, 8, "8");
|
||||
checkRow57423(testSheet, 9, "9");
|
||||
private void checkRows57423(Sheet testSheet) throws IOException {
|
||||
checkRow57423(testSheet, 0, "0");
|
||||
checkRow57423(testSheet, 1, "1");
|
||||
checkRow57423(testSheet, 2, "2");
|
||||
checkRow57423(testSheet, 3, "3");
|
||||
checkRow57423(testSheet, 4, "4");
|
||||
checkRow57423(testSheet, 5, "5");
|
||||
checkRow57423(testSheet, 6, "6");
|
||||
checkRow57423(testSheet, 7, "7");
|
||||
checkRow57423(testSheet, 8, "8");
|
||||
checkRow57423(testSheet, 9, "9");
|
||||
|
||||
assertNull("Row number 10 should be gone after the shift",
|
||||
testSheet.getRow(10));
|
||||
assertNull("Row number 10 should be gone after the shift",
|
||||
testSheet.getRow(10));
|
||||
|
||||
checkRow57423(testSheet, 11, "11");
|
||||
checkRow57423(testSheet, 12, "10");
|
||||
checkRow57423(testSheet, 13, "13");
|
||||
checkRow57423(testSheet, 14, "14");
|
||||
checkRow57423(testSheet, 15, "15");
|
||||
checkRow57423(testSheet, 16, "16");
|
||||
checkRow57423(testSheet, 17, "17");
|
||||
checkRow57423(testSheet, 18, "18");
|
||||
checkRow57423(testSheet, 11, "11");
|
||||
checkRow57423(testSheet, 12, "10");
|
||||
checkRow57423(testSheet, 13, "13");
|
||||
checkRow57423(testSheet, 14, "14");
|
||||
checkRow57423(testSheet, 15, "15");
|
||||
checkRow57423(testSheet, 16, "16");
|
||||
checkRow57423(testSheet, 17, "17");
|
||||
checkRow57423(testSheet, 18, "18");
|
||||
|
||||
ByteArrayOutputStream stream = new ByteArrayOutputStream();
|
||||
try {
|
||||
((XSSFSheet)testSheet).write(stream);
|
||||
} finally {
|
||||
stream.close();
|
||||
}
|
||||
ByteArrayOutputStream stream = new ByteArrayOutputStream();
|
||||
try {
|
||||
((XSSFSheet)testSheet).write(stream);
|
||||
} finally {
|
||||
stream.close();
|
||||
}
|
||||
|
||||
// verify that the resulting XML has the rows in correct order as required by Excel
|
||||
String xml = new String(stream.toByteArray(), "UTF-8");
|
||||
int posR12 = xml.indexOf("<row r=\"12\"");
|
||||
int posR13 = xml.indexOf("<row r=\"13\"");
|
||||
// verify that the resulting XML has the rows in correct order as required by Excel
|
||||
String xml = new String(stream.toByteArray(), "UTF-8");
|
||||
int posR12 = xml.indexOf("<row r=\"12\"");
|
||||
int posR13 = xml.indexOf("<row r=\"13\"");
|
||||
|
||||
// both need to be found
|
||||
assertTrue(posR12 != -1);
|
||||
assertTrue(posR13 != -1);
|
||||
// both need to be found
|
||||
assertTrue(posR12 != -1);
|
||||
assertTrue(posR13 != -1);
|
||||
|
||||
assertTrue("Need to find row 12 before row 13 after the shifting, but had row 12 at " + posR12 + " and row 13 at " + posR13,
|
||||
posR12 < posR13);
|
||||
}
|
||||
assertTrue("Need to find row 12 before row 13 after the shifting, but had row 12 at " + posR12 + " and row 13 at " + posR13,
|
||||
posR12 < posR13);
|
||||
}
|
||||
|
||||
private void checkRow57423(Sheet testSheet, int rowNum, String contents) {
|
||||
Row row = testSheet.getRow(rowNum);
|
||||
assertNotNull("Expecting row at rownum " + rowNum, row);
|
||||
private void checkRow57423(Sheet testSheet, int rowNum, String contents) {
|
||||
Row row = testSheet.getRow(rowNum);
|
||||
assertNotNull("Expecting row at rownum " + rowNum, row);
|
||||
|
||||
CTRow ctRow = ((XSSFRow)row).getCTRow();
|
||||
assertEquals(rowNum+1, ctRow.getR());
|
||||
CTRow ctRow = ((XSSFRow)row).getCTRow();
|
||||
assertEquals(rowNum+1, ctRow.getR());
|
||||
|
||||
Cell cell = row.getCell(0);
|
||||
assertNotNull("Expecting cell at rownum " + rowNum, cell);
|
||||
assertEquals("Did not have expected contents at rownum " + rowNum,
|
||||
contents + ".0", cell.toString());
|
||||
}
|
||||
Cell cell = row.getCell(0);
|
||||
assertNotNull("Expecting cell at rownum " + rowNum, cell);
|
||||
assertEquals("Did not have expected contents at rownum " + rowNum,
|
||||
contents + ".0", cell.toString());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug57423_shiftRowsByLargeOffset() throws IOException {
|
||||
try (
|
||||
XSSFWorkbook wb = new XSSFWorkbook();
|
||||
//OutputStream out = new FileOutputStream("/tmp/57423." + wb.getClass().getName() + ".xlsx"));
|
||||
XSSFWorkbook wb = new XSSFWorkbook();
|
||||
//OutputStream out = new FileOutputStream("/tmp/57423." + wb.getClass().getName() + ".xlsx"));
|
||||
) {
|
||||
Sheet sh = wb.createSheet();
|
||||
sh.createRow(0).createCell(0).setCellValue("a");
|
||||
@ -368,10 +368,10 @@ public final class TestUnfixedBugs {
|
||||
private void assertThatRowsInAscendingOrder(final XSSFWorkbook wb) {
|
||||
// Check that CTRows are stored in ascending order of row index
|
||||
long maxSeenRowNum = 0; //1-based
|
||||
for (final CTRow ctRow : wb.getSheetAt(0).getCTWorksheet().getSheetData().getRowArray()) {
|
||||
for (final CTRow ctRow : wb.getSheetAt(0).getCTWorksheet().getSheetData().getRowList()) {
|
||||
final long rowNum = ctRow.getR(); //1-based
|
||||
assertTrue("Row " + rowNum + " (1-based) is not in ascending order; previously saw " + maxSeenRowNum,
|
||||
rowNum > maxSeenRowNum);
|
||||
rowNum > maxSeenRowNum);
|
||||
maxSeenRowNum = rowNum;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user