浏览代码

resolve #297, fix GetSheetMap() failed

Change-Id: I585a4a017867b89bd39cb6e711467a46eaa757be
taomin597715379 7 年之前
父节点
当前提交
1bb59f75ea
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      sheet.go

+ 3 - 2
sheet.go

@@ -353,8 +353,9 @@ func (f *File) GetSheetMap() map[int]string {
 	sheetMap := map[int]string{}
 	sheetMap := map[int]string{}
 	for _, v := range content.Sheets.Sheet {
 	for _, v := range content.Sheets.Sheet {
 		for _, rel := range rels.Relationships {
 		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
 				sheetMap[rID] = v.Name
 			}
 			}
 		}
 		}