Merge pull request ClosedXML#269 from igitur/issue252-evaluate-formulas-when-saving

Evaluate formulas when saving

Author: igitur

ClosedXML/Excel/Cells/XLCell.cs

@@ -1,7 +1,9 @@
+using FastMember;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
@@ -12,7 +14,6 @@ namespace ClosedXML.Excel
 {
     using Attributes;
     using ClosedXML.Extensions;
-    using FastMember;
 
     internal class XLCell : IXLCell, IXLStylized
     {

ClosedXML/Excel/XLWorkbook.cs

@@ -429,27 +429,27 @@ public IXLRange RangeFromFullAddress(String rangeAddress, out IXLWorksheet ws)
         public void Save()
         {
 #if DEBUG
-            Save(true);
+            Save(true, false);
 #else
-            Save(false);
+            Save(false, false);
 #endif
         }
 
         /// <summary>
         ///   Saves the current workbook and optionally performs validation
         /// </summary>
-        public void Save(bool validate)
+        public void Save(Boolean validate, Boolean evaluateFormulae = false)
         {
             checkForWorksheetsPresent();
             if (_loadSource == XLLoadSource.New)
                 throw new Exception("This is a new file, please use one of the SaveAs methods.");
 
             if (_loadSource == XLLoadSource.Stream)
             {
-                CreatePackage(_originalStream, false, _spreadsheetDocumentType, validate);
+                CreatePackage(_originalStream, false, _spreadsheetDocumentType, validate, evaluateFormulae);
             }
             else
-                CreatePackage(_originalFile, _spreadsheetDocumentType, validate);
+                CreatePackage(_originalFile, _spreadsheetDocumentType, validate, evaluateFormulae);
         }
 
         /// <summary>
@@ -458,16 +458,16 @@ public void Save(bool validate)
         public void SaveAs(String file)
         {
 #if DEBUG
-            SaveAs(file, true);
+            SaveAs(file, true, false);
 #else
-            SaveAs(file, false);
+            SaveAs(file, false, false);
 #endif
         }
 
         /// <summary>
         ///   Saves the current workbook to a file and optionally validates it.
         /// </summary>
-        public void SaveAs(String file, Boolean validate)
+        public void SaveAs(String file, Boolean validate, Boolean evaluateFormulae = false)
         {
             checkForWorksheetsPresent();
             PathHelper.CreateDirectory(Path.GetDirectoryName(file));
@@ -476,14 +476,14 @@ public void SaveAs(String file, Boolean validate)
                 if (File.Exists(file))
                     File.Delete(file);
 
-                CreatePackage(file, GetSpreadsheetDocumentType(file), validate);
+                CreatePackage(file, GetSpreadsheetDocumentType(file), validate, evaluateFormulae);
             }
             else if (_loadSource == XLLoadSource.File)
             {
                 if (String.Compare(_originalFile.Trim(), file.Trim(), true) != 0)
                     File.Copy(_originalFile, file, true);
 
-                CreatePackage(file, GetSpreadsheetDocumentType(file), validate);
+                CreatePackage(file, GetSpreadsheetDocumentType(file), validate, evaluateFormulae);
             }
             else if (_loadSource == XLLoadSource.Stream)
             {
@@ -493,7 +493,7 @@ public void SaveAs(String file, Boolean validate)
                 {
                     CopyStream(_originalStream, fileStream);
                     //fileStream.Position = 0;
-                    CreatePackage(fileStream, false, _spreadsheetDocumentType, validate);
+                    CreatePackage(fileStream, false, _spreadsheetDocumentType, validate, evaluateFormulae);
                     fileStream.Close();
                 }
             }
@@ -531,16 +531,16 @@ private void checkForWorksheetsPresent()
         public void SaveAs(Stream stream)
         {
 #if DEBUG
-            SaveAs(stream, true);
+            SaveAs(stream, true, false);
 #else
-            SaveAs(stream, false);
+            SaveAs(stream, false, false);
 #endif
         }
 
         /// <summary>
         ///   Saves the current workbook to a stream and optionally validates it.
         /// </summary>
-        public void SaveAs(Stream stream, Boolean validate)
+        public void SaveAs(Stream stream, Boolean validate, Boolean evaluateFormulae = false)
         {
             checkForWorksheetsPresent();
             if (_loadSource == XLLoadSource.New)
@@ -552,13 +552,13 @@ public void SaveAs(Stream stream, Boolean validate)
                 if (stream.CanRead && stream.CanSeek && stream.CanWrite)
                 {
                     // all is fine the package can be created in a direct way
-                    CreatePackage(stream, true, _spreadsheetDocumentType, validate);
+                    CreatePackage(stream, true, _spreadsheetDocumentType, validate, evaluateFormulae);
                 }
                 else
                 {
                     // the harder way
                     MemoryStream ms = new MemoryStream();
-                    CreatePackage(ms, true, _spreadsheetDocumentType, validate);
+                    CreatePackage(ms, true, _spreadsheetDocumentType, validate, evaluateFormulae);
                     // not really nessesary, because I changed CopyStream too.
                     // but for better understanding and if somebody in the future
                     // provide an changed version of CopyStream
@@ -573,15 +573,15 @@ public void SaveAs(Stream stream, Boolean validate)
                     CopyStream(fileStream, stream);
                     fileStream.Close();
                 }
-                CreatePackage(stream, false, _spreadsheetDocumentType, validate);
+                CreatePackage(stream, false, _spreadsheetDocumentType, validate, evaluateFormulae);
             }
             else if (_loadSource == XLLoadSource.Stream)
             {
                 _originalStream.Position = 0;
                 if (_originalStream != stream)
                     CopyStream(_originalStream, stream);
 
-                CreatePackage(stream, false, _spreadsheetDocumentType, validate);
+                CreatePackage(stream, false, _spreadsheetDocumentType, validate, evaluateFormulae);
             }
         }