Merge pull request #357 from nlimpid/master

fix the wrong number of counting the rest empty rows

lib.go

@@ -629,7 +629,7 @@ func readRowsFromSheet(Worksheet *xlsxWorksheet, file *File, sheet *Sheet, rowLi
 	}
 
 	// insert trailing empty rows for the rest of the file
-	for ; insertRowIndex < maxRow; insertRowIndex++ {
+	for ; insertRowIndex < rowCount; insertRowIndex++ {
 		rows[insertRowIndex] = makeEmptyRow(sheet)
 	}
 	return rows, cols, colCount, rowCount

lib_test.go

@@ -1346,3 +1346,15 @@ func (l *LibSuite) TestRoundTripFileWithNoSheetCols(c *C) {
 	c.Assert(err, IsNil)
 	os.Remove("testdocs/after_write.xlsx")
 }
+
+func (l *LibSuite) TestReadRestEmptyRowsFromSheet(c *C) {
+	originalXlFile, err := OpenFile("testdocs/empty_rows_in_the_rest.xlsx")
+	c.Assert(err, IsNil)
+	for _, sheet := range originalXlFile.Sheets {
+		for _, row := range sheet.Rows {
+			if row == nil {
+				c.Errorf("Row should not be nil")
+			}
+		}
+	}
+}