From 574a6b20d1c9c15b12e2fe6d834e0cbb55a504d7 Mon Sep 17 00:00:00 2001 From: Ri Xu Date: Fri, 1 Sep 2017 12:59:15 +0800 Subject: Golang 1.9 compatible, fix issue #111 --- cell.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'cell.go') diff --git a/cell.go b/cell.go index b182e2b..ca590a9 100644 --- a/cell.go +++ b/cell.go @@ -96,17 +96,8 @@ func (f *File) GetCellValue(sheet, axis string) string { if axis != r.R { continue } - switch r.T { - case "s": - shardStrings := f.sharedStringsReader() - xlsxSI := 0 - xlsxSI, _ = strconv.Atoi(r.V) - return f.formattedValue(r.S, shardStrings.SI[xlsxSI].T) - case "str": - return f.formattedValue(r.S, r.V) - default: - return f.formattedValue(r.S, r.V) - } + val, _ := r.getValueFrom(f, f.sharedStringsReader()) + return val } } return "" -- cgit v1.2.1