--- ../../repository/SupportingLibraries/poi-3.10-wc/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java (revision ) +++ ../../repository/SupportingLibraries/poi-3.10-wc/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java (revision ) @@ -294,13 +294,15 @@ int firstHeaderColumn = ref.getCol(); XSSFRow row = sheet.getRow(headerRow); - if(row != null) for(CTTableColumn col : getCTTable().getTableColumns().getTableColumnList()){ - int colIdx = (int)col.getId() - 1 + firstHeaderColumn; - XSSFCell cell = row.getCell(colIdx); + if (row != null && row.getCTRow().validate()) { + int cellnum = firstHeaderColumn; + for (CTTableColumn col : getCTTable().getTableColumns().getTableColumnList()) { + XSSFCell cell = row.getCell(cellnum); - if(cell != null) { + if (cell != null) { - col.setName(cell.getStringCellValue()); - } + col.setName(cell.getStringCellValue()); + } + cellnum++; - } + } - + } } }