Fixes issue #440-Pivot cache fields that contains both ints and floats corrupts the pivot cache

Author: JanKallman

src/EPPlus/Table/PivotTable/ExcelPivotTableCacheField.cs

@@ -40,7 +40,8 @@ private enum DataTypeFlags
             Number = 0x8,
             DateTime = 0x10,
             Boolean = 0x20,
-            Error = 0x30
+            Error = 0x30,
+            Float = 0x40,
         }
         internal PivotTableCacheInternal _cache;
         internal ExcelPivotTableCacheField(XmlNamespaceManager nsm, XmlNode topNode, PivotTableCacheInternal cache, int index) : base(nsm, topNode)
@@ -131,7 +132,10 @@ internal void WriteSharedItems(XmlElement fieldNode, XmlNamespaceManager nsm)
             var noTypes = GetNoOfTypes(flags);
             if (noTypes > 1 && 
                 flags != (DataTypeFlags.Int | DataTypeFlags.Number) &&
-                flags != (DataTypeFlags.Int | DataTypeFlags.Number | DataTypeFlags.Empty) && 
+                flags != (DataTypeFlags.Float | DataTypeFlags.Number) &&
+                flags != (DataTypeFlags.Int | DataTypeFlags.Number | DataTypeFlags.Float) &&
+                flags != (DataTypeFlags.Int | DataTypeFlags.Number | DataTypeFlags.Empty) &&
+                flags != (DataTypeFlags.Int | DataTypeFlags.Number | DataTypeFlags.Float | DataTypeFlags.Empty) &&
                 SharedItems.Count > 1)
             {
                 if ((flags & DataTypeFlags.String) == DataTypeFlags.String ||
@@ -255,7 +259,8 @@ private void SetFlags(XmlElement shNode, DataTypeFlags flags)
             {
                 shNode.SetAttribute("containsNumber", "1");
             }
-            if ((flags & DataTypeFlags.Int) == DataTypeFlags.Int)
+            if ((flags & DataTypeFlags.Int) == DataTypeFlags.Int &&
+                (flags & DataTypeFlags.Float) != DataTypeFlags.Float)
             {
                 shNode.SetAttribute("containsInteger", "1");
             }
@@ -403,11 +408,15 @@ private DataTypeFlags GetFlags()
                         case TypeCode.Double:
                         case TypeCode.Single:
                             flags |= (DataTypeFlags.Number);
-                            if((flags&DataTypeFlags.Int)!= DataTypeFlags.Int && (Convert.ToDouble(si)%1==0))
+                            if ((flags & DataTypeFlags.Int) != DataTypeFlags.Int && (Convert.ToDouble(si) % 1 == 0))
                             {
                                 flags |= DataTypeFlags.Int;
                             }
-                            break;
+                            else if ((flags & DataTypeFlags.Float) != DataTypeFlags.Float && (Convert.ToDouble(si) % 1 != 0))
+                            {
+                                flags |= DataTypeFlags.Float;
+                            }
+                                break;
                         case TypeCode.DateTime:
                             flags |= DataTypeFlags.DateTime;
                             break;

src/EPPlusTest/Issues.cs

@@ -2336,6 +2336,21 @@ public void VbaIssueLoad()
                 var vba = p.Workbook.VbaProject;
                 SaveAndCleanup(p);
             }
-        }        
+        }
+        [TestMethod]
+        public void Issue440()
+        {
+            using (var p = OpenTemplatePackage("issue440.xlsx"))
+            {
+                var wb = p.Workbook;
+                var worksheet = wb.Worksheets.Add("Pivot Tables");
+                var table = wb.Worksheets[0].Tables["Table1"];
+                ExcelPivotTable pt = worksheet.PivotTables.Add(worksheet.Cells["A1"], table, "PT1");
+                pt.RowFields.Add(pt.Fields["ColC"]);
+                pt.DataFields.Add(pt.Fields["ColB"]);
+                SaveAndCleanup(p);
+            }
+        }
+
     }
 }