From 60722f015e9354f359e139f076935856010d6606 Mon Sep 17 00:00:00 2001 From: korv1982 Date: Mon, 23 Oct 2017 11:25:56 +0300 Subject: [PATCH] Issue: Numbers with some special formats reads as date --- col.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/col.go b/col.go index 371af91..fa9e02f 100644 --- a/col.go +++ b/col.go @@ -4,6 +4,7 @@ import ( "fmt" "math" "strconv" + "strings" "time" @@ -53,12 +54,18 @@ func (xf *XfRk) String(wb *WorkBook) string { fNo := wb.Xfs[idx].formatNo() if fNo >= 164 { // user defined format if formatter := wb.Formats[fNo]; formatter != nil { - i, f, isFloat := xf.Rk.number() - if !isFloat { - f = float64(i) + if (strings.Contains(formatter.str, "#") || strings.Contains(formatter.str, ".00")){ + //If format contains # or .00 then this is a number + return xf.Rk.String() + }else{ + i, f, isFloat := xf.Rk.number() + if !isFloat { + f = float64(i) + } + t := timeFromExcelTime(f, wb.dateMode == 1) + + return yymmdd.Format(t, formatter.str) } - t := timeFromExcelTime(f, wb.dateMode == 1) - return yymmdd.Format(t, formatter.str) } // see http://www.openoffice.org/sc/excelfileformat.pdf Page #174 } else if 14 <= fNo && fNo <= 17 || fNo == 22 || 27 <= fNo && fNo <= 36 || 50 <= fNo && fNo <= 58 { // jp. date format