BlackForestBytes/xls
20
0
Fork 0
Code

去掉不必要的符号过滤

Browse Source
This commit is contained in:
chen.s.g 2019-01-31 10:55:21 +08:00
parent 14d1dc9af4
commit d99e08e294
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
workbook.go
View File

@ -208,7 +208,7 @@ func (w *WorkBook) parseString(buf io.ReadSeeker, size uint16, from string) (res
if w.Is5ver { if w.Is5ver {
var bts = make([]byte, size) var bts = make([]byte, size)
_, err = buf.Read(bts) _, err = buf.Read(bts)
res = string(bytes.Trim(bts, "\r\n\t ")) res = string(bts)
} else { } else {
var richtext_num = uint16(0) var richtext_num = uint16(0)
var phonetic_size = uint32(0) var phonetic_size = uint32(0)
@ -238,13 +238,14 @@ func (w *WorkBook) parseString(buf io.ReadSeeker, size uint16, from string) (res
for ; i < size && err == nil; i++ { for ; i < size && err == nil; i++ {
err = binary.Read(buf, binary.LittleEndian, &bts[i]) err = binary.Read(buf, binary.LittleEndian, &bts[i])
} }
runes := utf16.Decode(bts[:i])
res = strings.Trim(string(runes), "\r\n\t ")
if i < size { if i < size {
w.continue_utf16 = size - i + 1 w.continue_utf16 = size - i + 1
} else if i == size && err == io.EOF { } else if i == size && err == io.EOF {
w.continue_utf16 = 1 w.continue_utf16 = 1
} }
res = string(utf16.Decode(bts[:i]))
} else { } else {
var n int var n int
var bts = make([]byte, size) var bts = make([]byte, size)
@ -258,8 +259,8 @@ func (w *WorkBook) parseString(buf io.ReadSeeker, size uint16, from string) (res
for k, v := range bts[:n] { for k, v := range bts[:n] {
bts1[k] = uint16(v) bts1[k] = uint16(v)
} }
runes := utf16.Decode(bts1)
res = strings.Trim(string(runes), "\r\n\t ") res = string(utf16.Decode(bts1))
} }
if richtext_num > 0 { if richtext_num > 0 {