|
|
@@ -334,6 +334,7 @@ func getValueFromCellData(rawcell xlsxC, reftable *RefTable) string {
|
|
|
// the value references from the reference table and stores them in
|
|
|
func readRowsFromSheet(Worksheet *xlsxWorksheet, file *File) ([]*Row, int, int) {
|
|
|
var rows []*Row
|
|
|
+ var cols []*Col
|
|
|
var row *Row
|
|
|
var minCol, maxCol, minRow, maxRow, colCount, rowCount int
|
|
|
var reftable *RefTable
|
|
|
@@ -355,7 +356,14 @@ func readRowsFromSheet(Worksheet *xlsxWorksheet, file *File) ([]*Row, int, int)
|
|
|
rowCount = (maxRow - minRow) + 1
|
|
|
colCount = (maxCol - minCol) + 1
|
|
|
rows = make([]*Row, rowCount)
|
|
|
+ cols = make([]*Col, len(Worksheet.Cols.Col))
|
|
|
insertRowIndex = minRow
|
|
|
+ for colIndex := 0; colIndex < len(Worksheet.Cols.Col); colIndex++ {
|
|
|
+ rawcol := Worksheet.Cols.Col[colIndex]
|
|
|
+ cols[colIndex] = &Col{
|
|
|
+ Hidden: rawcol.Hidden,
|
|
|
+ }
|
|
|
+ }
|
|
|
for rowIndex := 0; rowIndex < len(Worksheet.SheetData.Row); rowIndex++ {
|
|
|
rawrow := Worksheet.SheetData.Row[rowIndex]
|
|
|
// Some spreadsheets will omit blank rows from the
|
|
|
@@ -389,6 +397,7 @@ func readRowsFromSheet(Worksheet *xlsxWorksheet, file *File) ([]*Row, int, int)
|
|
|
row.Cells[cellX].styles = file.styles
|
|
|
row.Cells[cellX].numFmtRefTable = file.numFmtRefTable
|
|
|
row.Cells[cellX].date1904 = file.Date1904
|
|
|
+ row.Cells[cellX].Hidden = rawrow.Hidden || cols[cellX].Hidden
|
|
|
insertColIndex++
|
|
|
}
|
|
|
if len(rows) > insertRowIndex-minRow {
|