BlackForestBytes/xls
18
0
Fork 0
Code Activity

Merge 46b1dcb078 into 4a6cf26307

Browse Source
This commit is contained in:
Nikhil Bhargava
2020-04-26 20:48:35 +08:00
committed by GitHub
parent 4a6cf26307 46b1dcb078
commit 5afd85a7da
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workbook.go
View File

@@ -226,15 +226,13 @@ func (w *WorkBook) get_string(buf io.ReadSeeker, size uint16) (res string, err e
res = string(runes) res = string(runes)
} }
if richtext_num > 0 { if richtext_num > 0 {
var bts []byte
var seek_size int64 var seek_size int64
if w.Is5ver { if w.Is5ver {
seek_size = int64(2 * richtext_num) seek_size = int64(2 * richtext_num)
} else { } else {
seek_size = int64(4 * richtext_num) seek_size = int64(4 * richtext_num)
} }
bts = make([]byte, seek_size) _, err = buf.Seek(seek_size, io.SeekCurrent)
err = binary.Read(buf, binary.LittleEndian, bts)
if err == io.EOF { if err == io.EOF {
w.continue_rich = richtext_num w.continue_rich = richtext_num
} }
@@ -242,9 +240,7 @@ func (w *WorkBook) get_string(buf io.ReadSeeker, size uint16) (res string, err e
// err = binary.Read(buf, binary.LittleEndian, bts) // err = binary.Read(buf, binary.LittleEndian, bts)
} }
if phonetic_size > 0 { if phonetic_size > 0 {
var bts []byte _, err = buf.Seek(int64(phonetic_size), io.SeekCurrent)
bts = make([]byte, phonetic_size)
err = binary.Read(buf, binary.LittleEndian, bts)
if err == io.EOF { if err == io.EOF {
w.continue_apsb = phonetic_size w.continue_apsb = phonetic_size
} }