diff options
| author | vettich <vetti.ch@ya.ru> | 2021-07-03 11:13:26 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 14:13:26 +0800 |
| commit | 5ec61310dc55c9af93d66e6d225f721738416d1f (patch) | |
| tree | ffd126bf5f7e0ff139d54bdfb44804923d9dcc3a | |
| parent | f27624acddfb51916e028f421568840595dbad67 (diff) | |
fix: LocalSheetID in DefinedName should be equal to SheetIndex instead of SheetID (#868)
| -rw-r--r-- | sheet.go | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -507,17 +507,17 @@ func (f *File) DeleteSheet(name string) { wb := f.workbookReader() wbRels := f.relsReader(f.getWorkbookRelsPath()) activeSheetName := f.GetSheetName(f.GetActiveSheetIndex()) - deleteSheetID := f.getSheetID(name) + deleteLocalSheetID := f.GetSheetIndex(name) // Delete and adjust defined names if wb.DefinedNames != nil { for idx := 0; idx < len(wb.DefinedNames.DefinedName); idx++ { dn := wb.DefinedNames.DefinedName[idx] if dn.LocalSheetID != nil { - sheetID := *dn.LocalSheetID + 1 - if sheetID == deleteSheetID { + localSheetID := *dn.LocalSheetID + if localSheetID == deleteLocalSheetID { wb.DefinedNames.DefinedName = append(wb.DefinedNames.DefinedName[:idx], wb.DefinedNames.DefinedName[idx+1:]...) idx-- - } else if sheetID > deleteSheetID { + } else if localSheetID > deleteLocalSheetID { wb.DefinedNames.DefinedName[idx].LocalSheetID = intPtr(*dn.LocalSheetID - 1) } } @@ -1495,7 +1495,7 @@ func (f *File) SetDefinedName(definedName *DefinedName) error { for _, dn := range wb.DefinedNames.DefinedName { var scope string if dn.LocalSheetID != nil { - scope = f.getSheetNameByID(*dn.LocalSheetID + 1) + scope = f.GetSheetName(*dn.LocalSheetID) } if scope == definedName.Scope && dn.Name == definedName.Name { return errors.New("the same name already exists on the scope") @@ -1525,7 +1525,7 @@ func (f *File) DeleteDefinedName(definedName *DefinedName) error { for idx, dn := range wb.DefinedNames.DefinedName { var scope string if dn.LocalSheetID != nil { - scope = f.getSheetNameByID(*dn.LocalSheetID + 1) + scope = f.GetSheetName(*dn.LocalSheetID) } if scope == definedName.Scope && dn.Name == definedName.Name { wb.DefinedNames.DefinedName = append(wb.DefinedNames.DefinedName[:idx], wb.DefinedNames.DefinedName[idx+1:]...) @@ -1550,7 +1550,7 @@ func (f *File) GetDefinedName() []DefinedName { Scope: "Workbook", } if dn.LocalSheetID != nil && *dn.LocalSheetID >= 0 { - definedName.Scope = f.getSheetNameByID(*dn.LocalSheetID + 1) + definedName.Scope = f.GetSheetName(*dn.LocalSheetID) } definedNames = append(definedNames, definedName) } |