Fixes issue 1523 (#1525)

JanKallman · web-flow · commit d3d5dd76b7d5 · 2024-07-22T13:23:02.000+02:00
* Fixes issue #1523 * Fixed handling of cultures in Text property * Removed using
diff --git a/src/EPPlus/ExcelWorkbook.cs b/src/EPPlus/ExcelWorkbook.cs
@@ -215,7 +215,9 @@ internal ExcelWorkbook(ExcelPackage package, XmlNamespaceManager namespaceManage
 			TopNode = WorkbookXml.DocumentElement;
 			SchemaNodeOrder = new string[] { "fileVersion", "fileSharing", "workbookPr", "workbookProtection", "bookViews", "sheets", "functionGroups", "functionPrototypes", "externalReferences", "definedNames", "calcPr", "oleSize", "customWorkbookViews", "pivotCaches", "smartTagPr", "smartTagTypes", "webPublishing", "fileRecoveryPr", "webPublishObjects", "extLst" };
 			FullCalcOnLoad = true;  //Full calculation on load by default, for both new workbooks and templates.
-			GetSharedStrings();
+			FullPrecision = GetXmlNodeBool("d:calcPr/@fullPrecision", false);
+
+            GetSharedStrings();
 		}
 
 		/// <summary>
@@ -1152,8 +1154,16 @@ public ExcelCalcMode CalcMode
 			}
 			#endregion
 		}
-
-		private const string FULL_CALC_ON_LOAD_PATH = "d:calcPr/@fullCalcOnLoad";
+		/// <summary>
+		/// If false, EPPlus will round cell values to the number of decimals as displayed in the cell by using the cells number format when calculating the workbook. 
+		/// If true, full precision will be used on calculation.
+		/// </summary>
+		public bool FullPrecision 
+		{
+			get;
+			set; 
+		}
+        private const string FULL_CALC_ON_LOAD_PATH = "d:calcPr/@fullCalcOnLoad";
 		/// <summary>
 		/// Should Excel do a full calculation after the workbook has been loaded?
 		/// <remarks>This property is always true for both new workbooks and loaded templates(on load). If this is not the wanted behavior set this property to false.</remarks>
@@ -1222,7 +1232,9 @@ internal void Save()  // Workbook Save
 
 			DeleteCalcChain();
 
-			if (_vba == null && !_package.ZipPackage.PartExists(new Uri(ExcelVbaProject.PartUri, UriKind.Relative)))
+            SetXmlNodeBool("d:calcPr/@fullPrecision", FullPrecision, false);
+
+            if (_vba == null && !_package.ZipPackage.PartExists(new Uri(ExcelVbaProject.PartUri, UriKind.Relative)))
 			{
 				if (Part.ContentType != ContentTypes.contentTypeWorkbookDefault &&
 					Part.ContentType != ContentTypes.contentTypeWorkbookMacroEnabled)
diff --git a/src/EPPlus/Style/XmlAccess/ExcelFormatTranslator.cs b/src/EPPlus/Style/XmlAccess/ExcelFormatTranslator.cs
@@ -61,9 +61,9 @@ internal ExcelFormatTranslator(string format, int numFmtID)
                 DataType = eFormatType.DateTime;
                 f.SpecialDateFormat = eSystemDateFormat.SystemShortDate;
             }
-            else if (format.Equals("general", StringComparison.OrdinalIgnoreCase))
+            else if (ContainsGeneral(ref format))
             {
-                f.NetFormat = f.NetFormatForWidth = "G10";
+                f.NetFormat = f.NetFormatForWidth = format;
                 DataType = eFormatType.Number;
                 f.SpecialDateFormat = eSystemDateFormat.General;
             }
@@ -74,6 +74,42 @@ internal ExcelFormatTranslator(string format, int numFmtID)
             }
         }
 
+        private bool ContainsGeneral(ref string format)
+        {
+            if(format.IndexOf("general", StringComparison.OrdinalIgnoreCase) < 0) return false;
+            var ret = false;
+            var sb = new StringBuilder();
+            bool inString = false;
+            char pc='\0';
+            for (int i= 0;i<format.Length;i++)
+            {
+                var c = format[i];
+                if (c=='\"' && pc!='\\')
+                {
+                    inString=!inString;
+                    continue;
+                }
+                else if (i+1 < format.Length && c=='\\' && format[i+1]!='\\')
+                {
+                    continue;
+                }
+                else if(inString == false)
+                {
+                    if(i+7 <= format.Length && (c=='g' || c == 'G') && format.Substring(i,7).Equals("general", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        ret = true;
+                        sb.Append("{0}");
+                        i += 6;
+                        continue;
+                    }
+                }
+                pc = c;
+                sb.Append(c);
+            }
+            format=sb.ToString(); 
+            return ret;
+        }
+
         // escape ('\')  before these characters will be retained
         private static char[] _escapeChars = new char[] { '.', ',', '\'' };
 
@@ -577,8 +613,12 @@ internal FormatPart GetFormatPart(object value)
             else if (Formats[0].SpecialDateFormat==eSystemDateFormat.General)
             {
                 var d = ConvertUtil.GetValueDouble(value);
-                Formats[0].NetFormat = Formats[0].NetFormatForWidth = GetGeneralFormatFromDoubleValue(d);
-
+                var fmt = GetGeneralFormatFromDoubleValue(d);
+                foreach(var f in Formats)
+                {
+                    f.NetFormat = string.Format(f.NetFormat, "{0:" + fmt + "}");
+                    f.NetFormatForWidth = string.Format(f.NetFormatForWidth, "{0:" + fmt + "}");
+                }
             }
 
             return Formats[0];
diff --git a/src/EPPlus/Utils/ValueToTextHandler.cs b/src/EPPlus/Utils/ValueToTextHandler.cs
@@ -86,8 +86,15 @@ internal static string FormatValue(object v, bool forWidthCalc, ExcelFormatTrans
                 if (nf.DataType == ExcelNumberFormatXml.eFormatType.Number)
                 {
                     if (string.IsNullOrEmpty(f.FractionFormat))
-                    {                        
-                        return FormatNumber(d, format, overrideCultureInfo ?? nf.Culture);
+                    {
+                        if (f.SpecialDateFormat == ExcelFormatTranslator.eSystemDateFormat.General)
+                        {
+                            return string.Format(overrideCultureInfo ?? nf.Culture, f.NetFormat, d);
+                        }
+                        else
+                        {
+                            return FormatNumber(d, format, overrideCultureInfo ?? nf.Culture);
+                        }
                     }
                     else
                     {
diff --git a/src/EPPlusTest/Export/JsonExport/TableExporterTests.cs b/src/EPPlusTest/Export/JsonExport/TableExporterTests.cs
@@ -32,6 +32,7 @@ public void ValidateJsonExport()
         [TestMethod]
         public async Task ValidateJsonExportRange()
         {
+            SwitchToCulture();
             using (var p = new ExcelPackage())
             {
                 var ws = p.Workbook.Worksheets.Add($"Sheet1");
@@ -66,6 +67,7 @@ public async Task ValidateJsonExportRange()
                 Assert.AreEqual("{\"range\":{\"columns\":[{\"name\":\"SEK\",\"dt\":\"number\"},{\"name\":\"EUR\",\"dt\":\"number\"},{\"name\":\"USD\",\"dt\":\"number\"}],\"rows\":[{\"cells\":[{\"v\":\"1\",\"t\":\"1\"},{\"v\":\"10.35\",\"t\":\"10,35\"},{\"v\":\"9.51\",\"t\":\"9,51\"}]},{\"cells\":[{\"v\":\"1\",\"t\":\"1\"},{\"v\":\"10.48\",\"t\":\"10,48\"},{\"v\":\"9.59\",\"t\":\"9,59\"}]}]}}",
                     json);
             }
+            SwitchBackToCurrentCulture();
         }
         [TestMethod]
         public void ValidateJsonEncoding()
diff --git a/src/EPPlusTest/Issues/StylingIssues.cs b/src/EPPlusTest/Issues/StylingIssues.cs
@@ -195,6 +195,23 @@ public void Issue1493()
             
             SwitchBackToCurrentCulture();
         }
+        [TestMethod]
+        public void i1523()
+        {
+            using (var package = new ExcelPackage())
+            {
+                SwitchToCulture();
+                var sheet = package.Workbook.Worksheets.Add("Sheet1");
+                sheet.Cells["A1"].Value = 123;
+                sheet.Cells["A1"].Style.Numberformat.Format = "General\\ \"mm\"";
+                Assert.AreEqual("123 mm", sheet.Cells[1, 1].Text);
+
+                sheet.Cells["A2"].Value = 123456789.1234;
+                sheet.Cells["A2"].Style.Numberformat.Format = "General\\ \"mm\"";
+                Assert.AreEqual("123456789.1 mm", sheet.Cells[2, 1].Text);
+                SwitchBackToCurrentCulture();
+            }
+        }
         public string TextHandler(NumberFormatToTextArgs options)
         {
             switch(options.NumberFormat.NumFmtId)
diff --git a/src/EPPlusTest/Table/PivotTable/Calculation/PivotTableCalculationDemoTests.cs b/src/EPPlusTest/Table/PivotTable/Calculation/PivotTableCalculationDemoTests.cs
@@ -22,7 +22,10 @@ public static void Init(TestContext context)
         [ClassCleanup]
         public static void Cleanup()
         {
-            _package.Dispose();
+            if (_package != null)
+            {
+                _package.Dispose();
+            }
         }
         [TestMethod]
         public void DemoTest()

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,15 @@ internal static string FormatValue(object v, bool forWidthCalc, ExcelFormatTrans`
`86`	`86`	`if (nf.DataType == ExcelNumberFormatXml.eFormatType.Number)`
`87`	`87`	`{`
`88`	`88`	`if (string.IsNullOrEmpty(f.FractionFormat))`
`89`		`- {`
`90`		`- return FormatNumber(d, format, overrideCultureInfo ?? nf.Culture);`
	`89`	`+ {`
	`90`	`+ if (f.SpecialDateFormat == ExcelFormatTranslator.eSystemDateFormat.General)`
	`91`	`+ {`
	`92`	`+ return string.Format(overrideCultureInfo ?? nf.Culture, f.NetFormat, d);`
	`93`	`+ }`
	`94`	`+ else`
	`95`	`+ {`
	`96`	`+ return FormatNumber(d, format, overrideCultureInfo ?? nf.Culture);`
	`97`	`+ }`
`91`	`98`	`}`
`92`	`99`	`else`
`93`	`100`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public void ValidateJsonExport()`
`32`	`32`	`[TestMethod]`
`33`	`33`	`public async Task ValidateJsonExportRange()`
`34`	`34`	`{`
	`35`	`+ SwitchToCulture();`
`35`	`36`	`using (var p = new ExcelPackage())`
`36`	`37`	`{`
`37`	`38`	`var ws = p.Workbook.Worksheets.Add($"Sheet1");`
`@@ -66,6 +67,7 @@ public async Task ValidateJsonExportRange()`
`66`	`67`	`Assert.AreEqual("{\"range\":{\"columns\":[{\"name\":\"SEK\",\"dt\":\"number\"},{\"name\":\"EUR\",\"dt\":\"number\"},{\"name\":\"USD\",\"dt\":\"number\"}],\"rows\":[{\"cells\":[{\"v\":\"1\",\"t\":\"1\"},{\"v\":\"10.35\",\"t\":\"10,35\"},{\"v\":\"9.51\",\"t\":\"9,51\"}]},{\"cells\":[{\"v\":\"1\",\"t\":\"1\"},{\"v\":\"10.48\",\"t\":\"10,48\"},{\"v\":\"9.59\",\"t\":\"9,59\"}]}]}}",`
`67`	`68`	`json);`
`68`	`69`	`}`
	`70`	`+ SwitchBackToCurrentCulture();`
`69`	`71`	`}`
`70`	`72`	`[TestMethod]`
`71`	`73`	`public void ValidateJsonEncoding()`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,10 @@ public static void Init(TestContext context)`
`22`	`22`	`[ClassCleanup]`
`23`	`23`	`public static void Cleanup()`
`24`	`24`	`{`
`25`		`- _package.Dispose();`
	`25`	`+ if (_package != null)`
	`26`	`+ {`
	`27`	`+ _package.Dispose();`
	`28`	`+ }`
`26`	`29`	`}`
`27`	`30`	`[TestMethod]`
`28`	`31`	`public void DemoTest()`