From a410b22bdd50e9f212b0b454e5aed798e3476394 Mon Sep 17 00:00:00 2001 From: xuri Date: Fri, 28 Oct 2022 00:31:55 +0800 Subject: Fix the error on getting the range of merged cells on the worksheet which contains one cell merged cell range - Parse workbook default theme for custom theme color support in the feature - Variables name typo fix - Add system foreground and background color as RGB in the IndexedColorMapping list --- rows.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'rows.go') diff --git a/rows.go b/rows.go index 4f05f24..5b21f29 100644 --- a/rows.go +++ b/rows.go @@ -744,8 +744,8 @@ func checkRow(ws *xlsxWorksheet) error { } if colCount < lastCol { - oldList := rowData.C - newList := make([]xlsxC, 0, lastCol) + sourceList := rowData.C + targetList := make([]xlsxC, 0, lastCol) rowData.C = ws.SheetData.Row[rowIdx].C[:0] @@ -754,13 +754,13 @@ func checkRow(ws *xlsxWorksheet) error { if err != nil { return err } - newList = append(newList, xlsxC{R: cellName}) + targetList = append(targetList, xlsxC{R: cellName}) } - rowData.C = newList + rowData.C = targetList - for colIdx := range oldList { - colData := &oldList[colIdx] + for colIdx := range sourceList { + colData := &sourceList[colIdx] colNum, _, err := CellNameToCoordinates(colData.R) if err != nil { return err -- cgit v1.2.1