diff --git a/col.go b/col.go index fa9e02f..9ba155d 100644 --- a/col.go +++ b/col.go @@ -8,7 +8,7 @@ import ( "time" - "github.com/extrame/goyymmdd" + yymmdd "github.com/extrame/goyymmdd" ) //content type @@ -54,16 +54,15 @@ 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 { - if (strings.Contains(formatter.str, "#") || strings.Contains(formatter.str, ".00")){ + 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{ + 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) } } diff --git a/workbook.go b/workbook.go index fd655e5..4ebb605 100644 --- a/workbook.go +++ b/workbook.go @@ -6,6 +6,7 @@ import ( "io" "os" "unicode/utf16" + "golang.org/x/text/encoding/charmap" ) @@ -162,9 +163,9 @@ func (wb *WorkBook) parseBof(buf io.ReadSeeker, b *bof, pre *bof, offset_pre int return } func decodeWindows1251(enc []byte) string { - dec := charmap.Windows1251.NewDecoder() - out, _ := dec.Bytes(enc) - return string(out) + dec := charmap.Windows1251.NewDecoder() + out, _ := dec.Bytes(enc) + return string(out) } func (w *WorkBook) get_string(buf io.ReadSeeker, size uint16) (res string, err error) { if w.Is5ver {