go/grate
1
0
Fork 0
mirror of https://github.com/pbnjay/grate.git synced 2025-03-04 08:08:05 +02:00
Code Issues Releases Activity

fix some oob errors

Browse Source
This commit is contained in:
Jeremy Jay 2021-02-14 14:53:44 -05:00
parent 2896a36e3a
commit ad8345b944
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xlsx/sheets.go
View File

@ -123,8 +123,13 @@ func (s *Sheet) parseSheet() error {
continue continue
} }
dims := strings.Split(ax[0], ":") dims := strings.Split(ax[0], ":")
s.minCol, s.minRow = refToIndexes(dims[0]) if len(dims) == 1 {
s.maxCol, s.maxRow = refToIndexes(dims[1]) s.minCol, s.minRow = 0, 0
s.maxCol, s.maxRow = refToIndexes(dims[0])
} else {
s.minCol, s.minRow = refToIndexes(dims[0])
s.maxCol, s.maxRow = refToIndexes(dims[1])
}
//log.Println("DIMENSION:", s.minRow, s.minCol, ">", s.maxRow, s.maxCol) //log.Println("DIMENSION:", s.minRow, s.minCol, ">", s.maxRow, s.maxCol)
case "row": case "row":
//currentRow = ax["r"] // unsigned int row index //currentRow = ax["r"] // unsigned int row index
@ -147,7 +152,10 @@ func (s *Sheet) parseSheet() error {
ax := getAttrs(v.Attr, "ref") ax := getAttrs(v.Attr, "ref")
dims := strings.Split(ax[0], ":") dims := strings.Split(ax[0], ":")
startCol, startRow := refToIndexes(dims[0]) startCol, startRow := refToIndexes(dims[0])
endCol, endRow := refToIndexes(dims[1]) endCol, endRow := startCol, startRow
if len(dims) > 1 {
endCol, endRow = refToIndexes(dims[1])
}
for r := startRow; r <= endRow; r++ { for r := startRow; r <= endRow; r++ {
for c := startCol; c <= endCol; c++ { for c := startCol; c <= endCol; c++ {
if r == startRow && c == startCol { if r == startRow && c == startCol {