From 6429588e1448f70539774a88840f094829cb9e07 Mon Sep 17 00:00:00 2001 From: MJacred Date: Thu, 14 Jul 2022 17:36:43 +0200 Subject: adjust `ErrColumnNumber`, rename `TotalColumns` to `MaxColumns` and add new constant `MinColumns` (#1272) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Benjamin Lösch --- calc.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'calc.go') diff --git a/calc.go b/calc.go index 78846d2..d8161ce 100644 --- a/calc.go +++ b/calc.go @@ -1419,7 +1419,7 @@ func (f *File) parseReference(ctx *calcContext, sheet, reference string) (arg fo err = newInvalidColumnNameError(tokens[1]) return } - cr.Col = TotalColumns + cr.Col = MaxColumns } } if refs.Len() > 0 { @@ -1439,7 +1439,7 @@ func (f *File) parseReference(ctx *calcContext, sheet, reference string) (arg fo err = newInvalidColumnNameError(tokens[0]) return } - cr.Col = TotalColumns + cr.Col = MaxColumns } cellRanges.PushBack(cellRange{ From: cellRef{Sheet: sheet, Col: cr.Col, Row: 1}, @@ -14457,8 +14457,8 @@ func (fn *formulaFuncs) COLUMNS(argsList *list.List) formulaArg { return newErrorFormulaArg(formulaErrorVALUE, "COLUMNS requires 1 argument") } min, max := calcColumnsMinMax(argsList) - if max == TotalColumns { - return newNumberFormulaArg(float64(TotalColumns)) + if max == MaxColumns { + return newNumberFormulaArg(float64(MaxColumns)) } result := max - min + 1 if max == min { -- cgit v1.2.1