From dde6b9c00135cefffdd9c64b7f22cfdc34c28e47 Mon Sep 17 00:00:00 2001 From: devloppper <76152313+devloppper@users.noreply.github.com> Date: Tue, 22 Nov 2022 00:14:03 +0800 Subject: This closes #1396, fix formula fn ADDRESS result error with empty worksheet name (#1397) - Update unit tests Co-authored-by: jayhoo --- calc.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'calc.go') diff --git a/calc.go b/calc.go index b4090c9..9c360c1 100644 --- a/calc.go +++ b/calc.go @@ -13960,13 +13960,10 @@ func (fn *formulaFuncs) ADDRESS(argsList *list.List) formulaArg { } var sheetText string if argsList.Len() == 5 { - sheetText = trimSheetName(argsList.Back().Value.(formulaArg).Value()) - } - if len(sheetText) > 0 { - sheetText = fmt.Sprintf("%s!", sheetText) + sheetText = fmt.Sprintf("%s!", trimSheetName(argsList.Back().Value.(formulaArg).Value())) } formatter := addressFmtMaps[fmt.Sprintf("%d_%s", int(absNum.Number), a1.Value())] - addr, err := formatter(int(colNum.Number), int(colNum.Number)) + addr, err := formatter(int(colNum.Number), int(rowNum.Number)) if err != nil { return newErrorFormulaArg(formulaErrorVALUE, formulaErrorVALUE) } -- cgit v1.2.1