mirror of
https://github.com/pbnjay/grate.git
synced 2024-12-12 13:35:18 +02:00
fix some oob errors
This commit is contained in:
parent
2896a36e3a
commit
ad8345b944
@ -123,8 +123,13 @@ func (s *Sheet) parseSheet() error {
|
||||
continue
|
||||
}
|
||||
dims := strings.Split(ax[0], ":")
|
||||
s.minCol, s.minRow = refToIndexes(dims[0])
|
||||
s.maxCol, s.maxRow = refToIndexes(dims[1])
|
||||
if len(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)
|
||||
case "row":
|
||||
//currentRow = ax["r"] // unsigned int row index
|
||||
@ -147,7 +152,10 @@ func (s *Sheet) parseSheet() error {
|
||||
ax := getAttrs(v.Attr, "ref")
|
||||
dims := strings.Split(ax[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 c := startCol; c <= endCol; c++ {
|
||||
if r == startRow && c == startCol {
|
||||
|
Loading…
Reference in New Issue
Block a user