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 --- sheetpr.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'sheetpr.go') diff --git a/sheetpr.go b/sheetpr.go index 14c18da..66761f3 100644 --- a/sheetpr.go +++ b/sheetpr.go @@ -154,7 +154,10 @@ func (o *AutoPageBreaks) getSheetPrOption(pr *xlsxSheetPr) { // AutoPageBreaks(bool) // OutlineSummaryBelow(bool) func (f *File) SetSheetPrOptions(name string, opts ...SheetPrOption) error { - sheet := f.workSheetReader(name) + sheet, err := f.workSheetReader(name) + if err != nil { + return err + } pr := sheet.SheetPr if pr == nil { pr = new(xlsxSheetPr) @@ -164,7 +167,7 @@ func (f *File) SetSheetPrOptions(name string, opts ...SheetPrOption) error { for _, opt := range opts { opt.setSheetPrOption(pr) } - return nil + return err } // GetSheetPrOptions provides a function to gets worksheet properties. @@ -177,11 +180,14 @@ func (f *File) SetSheetPrOptions(name string, opts ...SheetPrOption) error { // AutoPageBreaks(bool) // OutlineSummaryBelow(bool) func (f *File) GetSheetPrOptions(name string, opts ...SheetPrOptionPtr) error { - sheet := f.workSheetReader(name) + sheet, err := f.workSheetReader(name) + if err != nil { + return err + } pr := sheet.SheetPr for _, opt := range opts { opt.getSheetPrOption(pr) } - return nil + return err } -- cgit v1.2.1