diff --git a/components/fpspreadsheet/source/common/fpsexprparser.pas b/components/fpspreadsheet/source/common/fpsexprparser.pas index 2c9766f0d..e82a85211 100644 --- a/components/fpspreadsheet/source/common/fpsexprparser.pas +++ b/components/fpspreadsheet/source/common/fpsexprparser.pas @@ -1774,8 +1774,6 @@ begin Result := TsCellExprNode.Create(self, FWorksheet, r1, c1, flags, false) else begin sheet := FWorksheet.Workbook.GetWorksheetByName(sheetName); - if sheet = nil then - sheet := FWorksheet.Workbook.AddWorksheet(sheetname, true); Result := TsCellExprNode.Create(self, sheet, r1, c1, flags, true); end; end @@ -1789,8 +1787,6 @@ begin GetToken; if TokenType = ttCell then begin sheet := FWorksheet.Workbook.GetWorksheetByName(sheetName); - if sheet = nil then - sheet := FWorksheet.Workbook.AddWorksheet(sheetName, true); Result := TsCellExprNode.Create(self, sheet, CurrentToken, true) end else if TokenType = ttCellRange then begin diff --git a/components/fpspreadsheet/source/common/xlsxooxml.pas b/components/fpspreadsheet/source/common/xlsxooxml.pas index bb0cbdd22..9912bdb2c 100644 --- a/components/fpspreadsheet/source/common/xlsxooxml.pas +++ b/components/fpspreadsheet/source/common/xlsxooxml.pas @@ -731,7 +731,8 @@ begin end else // "Normal" formula - AWorksheet.WriteFormula(cell, formulaStr); + cell^.FormulaValue := formulaStr; +// AWorksheet.WriteFormula(cell, formulaStr); except on E:EExprParser do begin FWorkbook.AddErrorMsg(E.Message);