From 2514bb16c682679485dfb5298e1a5797b97bdcd7 Mon Sep 17 00:00:00 2001 From: xuri Date: Tue, 10 Nov 2020 23:48:09 +0800 Subject: Fix #724, standardize variable naming and update unit tests --- sheetview.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sheetview.go') diff --git a/sheetview.go b/sheetview.go index 23a0377..a942fb4 100644 --- a/sheetview.go +++ b/sheetview.go @@ -140,21 +140,21 @@ func (o *ZoomScale) getSheetViewOption(view *xlsxSheetView) { } // getSheetView returns the SheetView object -func (f *File) getSheetView(sheetName string, viewIndex int) (*xlsxSheetView, error) { - xlsx, err := f.workSheetReader(sheetName) +func (f *File) getSheetView(sheet string, viewIndex int) (*xlsxSheetView, error) { + ws, err := f.workSheetReader(sheet) if err != nil { return nil, err } if viewIndex < 0 { - if viewIndex < -len(xlsx.SheetViews.SheetView) { + if viewIndex < -len(ws.SheetViews.SheetView) { return nil, fmt.Errorf("view index %d out of range", viewIndex) } - viewIndex = len(xlsx.SheetViews.SheetView) + viewIndex - } else if viewIndex >= len(xlsx.SheetViews.SheetView) { + viewIndex = len(ws.SheetViews.SheetView) + viewIndex + } else if viewIndex >= len(ws.SheetViews.SheetView) { return nil, fmt.Errorf("view index %d out of range", viewIndex) } - return &(xlsx.SheetViews.SheetView[viewIndex]), err + return &(ws.SheetViews.SheetView[viewIndex]), err } // SetSheetViewOptions sets sheet view options. The viewIndex may be negative -- cgit v1.2.1