Fixed custom formatted datetime parse problem

eraydin · Feb 26, 2018 · 07d2259 · 07d2259
1 parent 8e82210
commit 07d2259
Show file tree

Hide file tree

Showing 3 changed files with 256 additions and 244 deletions.
diff --git a/src/EPPlus.Core.Extensions/ExcelTableExtensions.cs b/src/EPPlus.Core.Extensions/ExcelTableExtensions.cs
@@ -248,14 +248,17 @@ private static void TrySetProperty(object item, PropertyInfo property, object ce
 
             if (type == typeof(DateTime))
             {
-                DateTime d = DateTime.Parse(cell.ToString());
+                if (!DateTime.TryParse(cell.ToString(), out DateTime parsedDate))
+                {
+                    parsedDate = DateTime.FromOADate((double)cell);
+                }
 
                 itemType.InvokeMember(
                     property.Name,
                     BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty,
                     null,
                     item,
-                    new object[] { d });
+                    new object[] { parsedDate });
 
                 return;
             }
@@ -300,26 +303,12 @@ private static void TrySetProperty(object item, PropertyInfo property, object ce
 
             if (type.IsNumeric())
             {
-                if (cell.GetType() == typeof(DateTime))
-                {
-                    double newVal = ((DateTime)cell).ToOADate();
-
-                    itemType.InvokeMember(
-                        property.Name,
-                        BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty,
-                        null,
-                        item,
-                        new object[] { newVal });
-                }
-                else
-                {
-                    itemType.InvokeMember(
-                        property.Name,
-                        BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty,
-                        null,
-                        item,
-                        new object[] { Convert.ChangeType(cell, type) });
-                }
+                itemType.InvokeMember(
+                    property.Name,
+                    BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty,
+                    null,
+                    item,
+                    new object[] { Convert.ChangeType(cell, type) });
             }
         }
     }