From f2df344739146189a1dea7cfb81239231af5135b Mon Sep 17 00:00:00 2001 From: xuri Date: Mon, 15 Apr 2019 11:22:57 +0800 Subject: Resolve #369,#370 add error return value exported functions: GetMergeCells ProtectSheet UnprotectSheet UpdateLinkedValue GetMergeCells SetSheetVisible inner functions: workSheetReader copySheet --- sheetview.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sheetview.go') diff --git a/sheetview.go b/sheetview.go index 6b191e9..8ffc9bc 100644 --- a/sheetview.go +++ b/sheetview.go @@ -110,7 +110,10 @@ func (o *ZoomScale) getSheetViewOption(view *xlsxSheetView) { // getSheetView returns the SheetView object func (f *File) getSheetView(sheetName string, viewIndex int) (*xlsxSheetView, error) { - xlsx := f.workSheetReader(sheetName) + xlsx, err := f.workSheetReader(sheetName) + if err != nil { + return nil, err + } if viewIndex < 0 { if viewIndex < -len(xlsx.SheetViews.SheetView) { return nil, fmt.Errorf("view index %d out of range", viewIndex) @@ -120,7 +123,7 @@ func (f *File) getSheetView(sheetName string, viewIndex int) (*xlsxSheetView, er return nil, fmt.Errorf("view index %d out of range", viewIndex) } - return &(xlsx.SheetViews.SheetView[viewIndex]), nil + return &(xlsx.SheetViews.SheetView[viewIndex]), err } // SetSheetViewOptions sets sheet view options. -- cgit v1.2.1