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

The table auto-filter range should not include table footer rows, while the table range does. POI was using the same for both regardless of footers. 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1825182 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Greg Woolsey 2018-02-23 23:37:04 +00:00
parent 7019178203
commit 617013a376
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
View File

@ -350,6 +350,7 @@ public class XSSFTable extends POIXMLDocumentPart implements Table {
* Updates the reference for the cells of the table * Updates the reference for the cells of the table
* (see Open Office XML Part 4: chapter 3.5.1.2, attribute ref) * (see Open Office XML Part 4: chapter 3.5.1.2, attribute ref)
* and synchronizes any changes * and synchronizes any changes
* @param refs table range
* *
* @since 3.17 beta 1 * @since 3.17 beta 1
*/ */
@ -363,7 +364,18 @@ public class XSSFTable extends POIXMLDocumentPart implements Table {
// Update // Update
ctTable.setRef(ref); ctTable.setRef(ref);
if (ctTable.isSetAutoFilter()) { if (ctTable.isSetAutoFilter()) {
ctTable.getAutoFilter().setRef(ref); String filterRef;
int totalsRowCount = getTotalsRowCount();
if (totalsRowCount == 0) {
filterRef = ref;
} else {
final CellReference start = new CellReference(refs.getFirstCell().getRow(), refs.getFirstCell().getCol());
// account for footer row(s) in auto-filter range, which doesn't include footers
final CellReference end = new CellReference(refs.getLastCell().getRow() - totalsRowCount, refs.getLastCell().getCol());
// this won't have sheet references because we built the cell references without them
filterRef = new AreaReference(start, end, SpreadsheetVersion.EXCEL2007).formatAsString();
}
ctTable.getAutoFilter().setRef(filterRef);
} }
// Have everything recomputed // Have everything recomputed
@ -476,7 +488,7 @@ public class XSSFTable extends POIXMLDocumentPart implements Table {
if (row != null && row.getCTRow().validate()) { if (row != null && row.getCTRow().validate()) {
int cellnum = firstHeaderColumn; int cellnum = firstHeaderColumn;
for (CTTableColumn col : getCTTable().getTableColumns().getTableColumnArray()) { for (CTTableColumn col : getCTTable().getTableColumns().getTableColumnList()) {
XSSFCell cell = row.getCell(cellnum); XSSFCell cell = row.getCell(cellnum);
if (cell != null) { if (cell != null) {
col.setName(formatter.formatCellValue(cell)); col.setName(formatter.formatCellValue(cell));