Merge pull request #291 from peiqi111/master

resolve #289, #290
6 years ago · 507fc5307d
parent 2aca340f5d ef334ee658
commit 507fc5307d
1 changed files with 4 additions and 3 deletions
--- a/cell.go
+++ b/cell.go
@ -244,12 +244,13 @@ func (f *File) GetCellFormula(sheet, axis string) string {
 		if xlsx.SheetData.Row[k].R == row {
 			for i := range xlsx.SheetData.Row[k].C {
 				if axis == xlsx.SheetData.Row[k].C[i].R {
+					if xlsx.SheetData.Row[k].C[i].F == nil {
+						continue
+					}
 					if xlsx.SheetData.Row[k].C[i].F.T == STCellFormulaTypeShared {
 						return getSharedForumula(xlsx, xlsx.SheetData.Row[k].C[i].F.Si)
 					}
-					if xlsx.SheetData.Row[k].C[i].F != nil {
-						return xlsx.SheetData.Row[k].C[i].F.Content
-					}
+					return xlsx.SheetData.Row[k].C[i].F.Content
 				}
 			}
 		}