diff --git a/components/fpspreadsheet/source/common/fpstypes.pas b/components/fpspreadsheet/source/common/fpstypes.pas
index ce0bdfc92..ad1287f65 100644
--- a/components/fpspreadsheet/source/common/fpstypes.pas
+++ b/components/fpspreadsheet/source/common/fpstypes.pas
@@ -912,7 +912,8 @@ type
                                reading and writing. Lowest memory consumptions,
                                but slow.
     @param  boAutoCalc         Automatically recalculate formulas whenever a
-                               cell value changes.
+                               cell value changes, in particular when file is
+                               loaded.
     @param  boCalcBeforeSaving Calculates formulas before saving the file.
                                Otherwise there are no results when the file is
                                loaded back by fpspreadsheet.
diff --git a/components/fpspreadsheet/tests/celltypetests.pas b/components/fpspreadsheet/tests/celltypetests.pas
index 57798efa1..19e844cd7 100644
--- a/components/fpspreadsheet/tests/celltypetests.pas
+++ b/components/fpspreadsheet/tests/celltypetests.pas
@@ -118,6 +118,7 @@ begin
   try
     MyWorkbook.Options := MyWorkbook.Options + [boReadFormulas];
     MyWorkbook.ReadFromFile(TempFile, AFormat);
+    MyWorkbook.CalcFormulas;
     if AFormat in [sfExcel2, sfCSV] then
       MyWorksheet := MyWorkbook.GetFirstWorksheet  // only 1 sheet for BIFF2
     else
diff --git a/components/fpspreadsheet/tests/formulatests.pas b/components/fpspreadsheet/tests/formulatests.pas
index c170d32ca..674e52d56 100644
--- a/components/fpspreadsheet/tests/formulatests.pas
+++ b/components/fpspreadsheet/tests/formulatests.pas
@@ -399,6 +399,7 @@ begin
   try
     MyWorkbook.Options := Myworkbook.Options + [boReadFormulas];
     MyWorkbook.ReadFromFile(TempFile, AFormat);
+    MyWorkbook.CalcFormulas;
     if AFormat = sfExcel2 then
       MyWorksheet := MyWorkbook.GetFirstWorksheet
     else
@@ -735,7 +736,7 @@ begin
     try
       workbook.Options := workbook.Options + [boReadFormulas];
       workbook.ReadFromFile(TempFile, AFormat);
-//      workbook.CalcFormulas;
+      workbook.CalcFormulas;
 
       if AFormat = sfExcel2 then
         Fail('This test should not be executed')
diff --git a/components/fpspreadsheet/tests/testcases_calcrpnformula.inc b/components/fpspreadsheet/tests/testcases_calcrpnformula.inc
index 7bc0f27dc..299e5026c 100644
--- a/components/fpspreadsheet/tests/testcases_calcrpnformula.inc
+++ b/components/fpspreadsheet/tests/testcases_calcrpnformula.inc
@@ -223,10 +223,7 @@
     MyWorksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteErrorValue(Row, 2, errDivideByZero);
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errDivideByZero);
+  sollValues[Row] := ErrorResult(errDivideByZero);
 
   // Division of cell values
   inc(Row);
@@ -1009,10 +1006,7 @@
     MyWorksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteErrorValue(Row, 2, errOverflow);;
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errOverFlow);
+  sollValues[Row] := ErrorResult(errOverFlow);
 
    // ARCCOSH - valid result
   inc(Row);
@@ -1044,9 +1038,6 @@
     MyWorksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteErrorValue(Row, 2, errOverflow);
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
   if AFormat = sfExcel2 then
     sollValues[Row] := ErrorResult(errFormulaNotSupported)
   else
@@ -1079,10 +1070,7 @@
     Myworksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteErrorValue(Row, 2, errOverflow);
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errOverFlow);
+  sollValues[Row] := ErrorResult(errOverFlow);
 
    // ARCSINH
   inc(Row);
@@ -1147,9 +1135,6 @@
     myWorksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteErrorValue(Row, 2, errOverFlow);
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
   if AFormat = sfExcel2 then
     sollValues[Row] := ErrorResult(errFormulaNotSupported)
   else
@@ -1344,10 +1329,7 @@
     MyWorksheet.WriteFormula(Row, 1, formula);
   myWorksheet.WriteText(Row, 2, GetErrorValueStr(errOverflow));
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errOverflow);
+  sollValues[Row] := ErrorResult(errOverflow);
 
   // LN - error due to argument < 0
   inc(Row);
@@ -1361,10 +1343,7 @@
     MyWorksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteText(Row, 2, GetErrorValueStr(errOverflow));
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errOverflow);
+  sollValues[Row] := ErrorResult(errOverflow);
 
   // LOG10 - valid result
   inc(Row);
@@ -1393,10 +1372,7 @@
     MyWorksheet.WriteFormula(Row, 1, formula);
   myWorksheet.WriteText(Row, 2, GetErrorValueStr(errOverflow));
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errOverflow);
+  sollValues[Row] := ErrorResult(errOverflow);
 
   // LOG10 - error due to argument < 0
   inc(Row);
@@ -1410,10 +1386,7 @@
     MyWorksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteText(Row, 2, GetErrorValueStr(errOverFlow));
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errOverflow);
+  sollValues[Row] := ErrorResult(errOverflow);
 
   // LOG - valid result (2 arguments)
   inc(Row);
@@ -1444,10 +1417,7 @@
     MyWorksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteText(Row, 2, GetErrorValueStr(errOverflow));
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errOverflow);
+  sollValues[Row] := ErrorResult(errOverflow);
 
   // LOG - valid result (1 argument)
   inc(Row);
@@ -1477,10 +1447,7 @@
     MyWorksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteText(Row, 2, GetErrorValueStr(errOverflow));
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errOverflow);
+  sollValues[Row] := ErrorResult(errOverflow);
 
   // LOG - negative value
   inc(Row);
@@ -1495,10 +1462,7 @@
     MyWorksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteText(Row, 2, GetErrorValueStr(errOverflow));
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errOverflow);
+  sollValues[Row] := ErrorResult(errOverflow);
 
   // LOG of cell
   inc(Row);
@@ -1746,10 +1710,7 @@
     myWorksheet.WriteFormula(Row, 1, formula);
   MyWorksheet.WriteText(Row, 2, GetErrorValueStr(errOverflow));
   SetLength(sollValues, Row+1);
-  if AFormat = sfOpenDocument then
-    sollValues[Row] := FloatResult(0)
-  else
-    sollValues[Row] := ErrorResult(errOverflow);
+  sollValues[Row] := ErrorResult(errOverflow);
 
   // SQRT of cell value
   inc(Row);