@@ -507,17 +507,17 @@ func (f *File) DeleteSheet(name string) {
507
507
wb := f .workbookReader ()
508
508
wbRels := f .relsReader (f .getWorkbookRelsPath ())
509
509
activeSheetName := f .GetSheetName (f .GetActiveSheetIndex ())
510
- deleteSheetID := f .getSheetID (name )
510
+ deleteLocalSheetID := f .GetSheetIndex (name )
511
511
// Delete and adjust defined names
512
512
if wb .DefinedNames != nil {
513
513
for idx := 0 ; idx < len (wb .DefinedNames .DefinedName ); idx ++ {
514
514
dn := wb .DefinedNames .DefinedName [idx ]
515
515
if dn .LocalSheetID != nil {
516
- sheetID := * dn .LocalSheetID + 1
517
- if sheetID == deleteSheetID {
516
+ localSheetID := * dn .LocalSheetID
517
+ if localSheetID == deleteLocalSheetID {
518
518
wb .DefinedNames .DefinedName = append (wb .DefinedNames .DefinedName [:idx ], wb .DefinedNames .DefinedName [idx + 1 :]... )
519
519
idx --
520
- } else if sheetID > deleteSheetID {
520
+ } else if localSheetID > deleteLocalSheetID {
521
521
wb .DefinedNames .DefinedName [idx ].LocalSheetID = intPtr (* dn .LocalSheetID - 1 )
522
522
}
523
523
}
@@ -1495,7 +1495,7 @@ func (f *File) SetDefinedName(definedName *DefinedName) error {
1495
1495
for _ , dn := range wb .DefinedNames .DefinedName {
1496
1496
var scope string
1497
1497
if dn .LocalSheetID != nil {
1498
- scope = f .getSheetNameByID (* dn .LocalSheetID + 1 )
1498
+ scope = f .GetSheetName (* dn .LocalSheetID )
1499
1499
}
1500
1500
if scope == definedName .Scope && dn .Name == definedName .Name {
1501
1501
return errors .New ("the same name already exists on the scope" )
@@ -1525,7 +1525,7 @@ func (f *File) DeleteDefinedName(definedName *DefinedName) error {
1525
1525
for idx , dn := range wb .DefinedNames .DefinedName {
1526
1526
var scope string
1527
1527
if dn .LocalSheetID != nil {
1528
- scope = f .getSheetNameByID (* dn .LocalSheetID + 1 )
1528
+ scope = f .GetSheetName (* dn .LocalSheetID )
1529
1529
}
1530
1530
if scope == definedName .Scope && dn .Name == definedName .Name {
1531
1531
wb .DefinedNames .DefinedName = append (wb .DefinedNames .DefinedName [:idx ], wb .DefinedNames .DefinedName [idx + 1 :]... )
@@ -1550,7 +1550,7 @@ func (f *File) GetDefinedName() []DefinedName {
1550
1550
Scope : "Workbook" ,
1551
1551
}
1552
1552
if dn .LocalSheetID != nil && * dn .LocalSheetID >= 0 {
1553
- definedName .Scope = f .getSheetNameByID (* dn .LocalSheetID + 1 )
1553
+ definedName .Scope = f .GetSheetName (* dn .LocalSheetID )
1554
1554
}
1555
1555
definedNames = append (definedNames , definedName )
1556
1556
}
0 commit comments