From 0f93bd23c97ac0f04fe8012bd4a262c851e44a82 Mon Sep 17 00:00:00 2001 From: xuri Date: Fri, 29 Apr 2022 13:53:09 +0800 Subject: This closes #1213, fix get incorrect rich text value caused by missing cell type checking --- cell.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cell.go') diff --git a/cell.go b/cell.go index b2818e7..3c44af4 100644 --- a/cell.go +++ b/cell.go @@ -764,7 +764,7 @@ func (f *File) GetCellRichText(sheet, cell string) (runs []RichTextRun, err erro return } siIdx, err := strconv.Atoi(cellData.V) - if nil != err { + if err != nil || cellData.T != "s" { return } sst := f.sharedStringsReader() @@ -776,7 +776,7 @@ func (f *File) GetCellRichText(sheet, cell string) (runs []RichTextRun, err erro run := RichTextRun{ Text: v.T.Val, } - if nil != v.RPr { + if v.RPr != nil { font := Font{Underline: "none"} font.Bold = v.RPr.B != nil font.Italic = v.RPr.I != nil @@ -793,7 +793,7 @@ func (f *File) GetCellRichText(sheet, cell string) (runs []RichTextRun, err erro font.Size = *v.RPr.Sz.Val } font.Strike = v.RPr.Strike != nil - if nil != v.RPr.Color { + if v.RPr.Color != nil { font.Color = strings.TrimPrefix(v.RPr.Color.RGB, "FF") } run.Font = &font -- cgit v1.2.1