Fixes issue #1746 (#1747)

Author: JanKallman

src/EPPlus/Table/PivotTable/CacheComparer.cs

@@ -0,0 +1,60 @@
+/*************************************************************************************************
+  Required Notice: Copyright (C) EPPlus Software AB. 
+  This software is licensed under PolyForm Noncommercial License 1.0.0 
+  and may only be used for noncommercial purposes 
+  https://polyformproject.org/licenses/noncommercial/1.0.0/
+
+  A commercial license to use this software can be purchased at https://epplussoftware.com
+ *************************************************************************************************
+  Date               Author                       Change
+ *************************************************************************************************
+  01/27/2020         EPPlus Software AB       Initial release EPPlus 5
+ *************************************************************************************************/
+using OfficeOpenXml.Utils;
+using System;
+using System.Collections.Generic;
+
+namespace OfficeOpenXml.Table.PivotTable
+{
+    internal class CacheComparer : IEqualityComparer<object>
+    {
+        public new bool Equals(object x, object y)
+        {
+			x = GetCaseInsensitiveValue(x);
+            y = GetCaseInsensitiveValue(y);
+			return x.Equals(y);           
+		}
+
+        private static object GetCaseInsensitiveValue(object x)
+        {
+            if (x == null || x.Equals(ExcelPivotTable.PivotNullValue)) return ExcelPivotTable.PivotNullValue;
+
+			if (x is string sx)
+            {
+				return sx.ToLower();
+			}
+            else if (x is char cx)
+            {
+                return char.ToLower(cx).ToString();
+            }
+            else if(x is DateTime)
+            {
+                return x;
+            }
+            else if(x is TimeSpan ts)
+            {
+                return DateTime.FromOADate(0).Add(ts);
+            }
+            if(ConvertUtil.IsExcelNumeric(x))
+            {
+                return ConvertUtil.GetValueDouble(x);
+            }
+            return x.ToString().ToLower();
+        }
+
+        public int GetHashCode(object obj)
+        {
+            return GetCaseInsensitiveValue(obj).GetHashCode();
+        }
+    }
+}

src/EPPlus/Table/PivotTable/ExcelPivotTableCacheField.cs

@@ -937,6 +937,7 @@ private void UpdateSharedItems()
             {
                 UpdatePivotItemsFromSharedItems(siHs);
             }
+
             SharedItems._list = siHs.ToList();
 			UpdateCacheLookupFromItems(SharedItems._list, ref _cacheLookup);
 			if (HasSlicer)
@@ -962,15 +963,18 @@ private void UpdatePivotItemsFromSharedItems(HashSet<object> siHs)
                 var hasFilter = list.Any(x => x.Hidden);
                 for (var ix = 0; ix < list.Count; ix++)
                 {
-                    var v = list[ix].Value ?? ExcelPivotTable.PivotNullValue;
-                    if (!siHs.Contains(v) || existingItems.Contains(v))
-                    {
-                        list.RemoveAt(ix);
-                        ix--;
-                    }
-                    else
+                    if (list[ix].Type == eItemType.Data)
                     {
-                        existingItems.Add(v);
+                        var v = list[ix].Value ?? ExcelPivotTable.PivotNullValue;
+                        if (!siHs.Contains(v) || existingItems.Contains(v))
+                        {
+                            list.RemoveAt(ix);
+                            ix--;
+                        }
+                        else
+                        {
+                            existingItems.Add(v);
+                        }
                     }
                 }
                 var hasSubTotalSubt = list.Count > 0 && list[list.Count - 1].Type == eItemType.Default ? 1 : 0;
@@ -1106,38 +1110,4 @@ internal Dictionary<object, int> GetCacheLookup()
 		}
 
 	}
-
-    internal class CacheComparer : IEqualityComparer<object>
-    {
-        public new bool Equals(object x, object y)
-        {
-			x = GetCaseInsensitiveValue(x);
-            y = GetCaseInsensitiveValue(y);
-			return x.Equals(y);           
-		}
-
-        private static object GetCaseInsensitiveValue(object x)
-        {
-            if (x == null || x.Equals(ExcelPivotTable.PivotNullValue)) return ExcelPivotTable.PivotNullValue;
-
-			if (x is string sx)
-            {
-				return sx.ToLower();
-			}
-            else if (x is char cx)
-            {
-                return char.ToLower(cx).ToString();
-            }
-            if(ConvertUtil.IsExcelNumeric(x))
-            {
-                return ConvertUtil.GetValueDouble(x);
-            }
-            return x.ToString().ToLower();
-        }
-
-        public int GetHashCode(object obj)
-        {
-            return GetCaseInsensitiveValue(obj).GetHashCode();
-        }
-    }
 }

src/EPPlus/Table/PivotTable/ExcelPivotTableField.cs

@@ -51,7 +51,6 @@ internal ExcelPivotTableField(XmlNamespaceManager ns, XmlNode topNode, ExcelPivo
         }
 
         internal ExcelPivotTable PivotTable { get; set; }
-        //internal ExcelPivotTableCacheField CacheField { get; set; } = null;
 
         /// <summary>
         /// The index of the pivot table field

src/EPPlusTest/Issues/PivotTableIssues.cs

@@ -258,5 +258,24 @@ public void s744()
                 SaveAndCleanup(p);
             }
         }
+        [TestMethod]
+        public void s744_2()
+        {
+            using (var p = OpenTemplatePackage("s744-2.xlsx"))
+            {
+                ExcelWorkbook workbook = p.Workbook;
+                SaveAndCleanup(p); 
+            }
+        }
+        [TestMethod]
+        public void s744_3()
+        {
+            using (var p = OpenTemplatePackage("FilterClearingExample.xlsx"))
+            {
+                ExcelWorkbook workbook = p.Workbook;
+                p.Workbook.Worksheets[0].PivotTables[0].Calculate();
+                SaveAndCleanup(p);
+            }
+        }
     }
 }

src/EPPlusTest/Table/PivotTable/PivotTableTests.cs

@@ -355,6 +355,8 @@ public void Pivot_Blank()
             var rf = pt.RowFields.Add(pt.Fields[0]);
             rf.SubTotalFunctions = eSubTotalFunctions.None;
             pt.DataOnRows = true;
+            pt.Fields[0].Items.Refresh();
+            pt.Fields[1].Items.Refresh();
         }
         [TestMethod]
         public void Pivot_SaveDataFalse()