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

bug 59796: XSSFTable#getRowCount off-by-one error

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1751373 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-07-04 19:09:10 +00:00
parent 18f2e5e405
commit 24faa602e0
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,6 +325,7 @@ public class XSSFTable extends POIXMLDocumentPart implements Table {
/** /**
* @return the total number of rows in the selection. (Note: in this version autofiltering is ignored) * @return the total number of rows in the selection. (Note: in this version autofiltering is ignored)
* Returns <code>0</code> if the start or end cell references are not set.
* *
* Does not track updates to underlying changes to CTTable * Does not track updates to underlying changes to CTTable
* To synchronize with changes to the underlying CTTable, * To synchronize with changes to the underlying CTTable,
@ -334,10 +335,9 @@ public class XSSFTable extends POIXMLDocumentPart implements Table {
CellReference from = getStartCellReference(); CellReference from = getStartCellReference();
CellReference to = getEndCellReference(); CellReference to = getEndCellReference();
int rowCount = -1; int rowCount = 0;
if (from!=null && to!=null) { if (from!=null && to!=null) {
// FIXME: shouldn't this be to-from+1? rowCount = to.getRow() - from.getRow() + 1;
rowCount = to.getRow()-from.getRow();
} }
return rowCount; return rowCount;
} }

20
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java
View File

@ -267,4 +267,24 @@ public final class TestXSSFTable {
assertEquals(new CellReference("M3"), table.getEndCellReference()); assertEquals(new CellReference("M3"), table.getEndCellReference());
} }
@Test
public void getRowCount() {
XSSFWorkbook wb = new XSSFWorkbook();
XSSFSheet sh = wb.createSheet();
XSSFTable table = sh.createTable();
CTTable ctTable = table.getCTTable();
assertEquals(0, table.getRowCount());
ctTable.setRef("B2:B2");
// update cell references to clear the cache
table.updateReferences();
assertEquals(1, table.getRowCount());
ctTable.setRef("B2:B12");
// update cell references to clear the cache
table.updateReferences();
assertEquals(11, table.getRowCount());
}
} }