summaryrefslogtreecommitdiff
path: root/sheet.go
diff options
context:
space:
mode:
authorxuri <xuri.me@gmail.com>2018-11-24 21:38:39 +0800
committerGitHub <noreply@github.com>2018-11-24 21:38:39 +0800
commit724ed5f9f3835c317ca9b8b52c30d3cea8754a5b (patch)
treea19b509349e6d664442dcb5b74ff30e9ebf4d7c9 /sheet.go
parent507fc5307d17194203046321534244a8fe6215ed (diff)
parent1bb59f75ea71d88a20802f97da7158eb43d082dd (diff)
Merge pull request #300 from taomin597715379/bugfix_297
resolve #297, fix GetSheetMap() failed
Diffstat (limited to 'sheet.go')
-rwxr-xr-x[-rw-r--r--]sheet.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/sheet.go b/sheet.go
index 9861d20..3021946 100644..100755
--- a/sheet.go
+++ b/sheet.go
@@ -353,8 +353,9 @@ func (f *File) GetSheetMap() map[int]string {
sheetMap := map[int]string{}
for _, v := range content.Sheets.Sheet {
for _, rel := range rels.Relationships {
- if rel.ID == v.ID {
- rID, _ := strconv.Atoi(strings.TrimSuffix(strings.TrimPrefix(rel.Target, "worksheets/sheet"), ".xml"))
+ relStr := strings.SplitN(rel.Target, "worksheets/sheet", 2)
+ if rel.ID == v.ID && len(relStr) == 2 {
+ rID, _ := strconv.Atoi(strings.TrimSuffix(relStr[1], ".xml"))
sheetMap[rID] = v.Name
}
}