Static pivot tables - (blank) row and column #230 (#232)

Author: b0bi79

ClosedXML.Report/Options/TagExtensions.cs

@@ -0,0 +1,18 @@
+using System.Linq;
+using ClosedXML.Excel;
+
+namespace ClosedXML.Report.Options
+{
+    public static class TagExtensions
+    {
+        public static bool HasTag(string value)
+        {
+            return value.StartsWith("<<") || value.EndsWith(">>");
+        }
+
+        public static bool IsOptionsRowEmpty(this IXLRange range)
+        {
+            return !range.LastRow().CellsUsed(XLCellsUsedOptions.AllContents | XLCellsUsedOptions.MergedRanges).Any();
+        }
+    }
+}

ClosedXML.Report/RangeInterpreter.cs

@@ -45,7 +45,7 @@ public void ParseTags(IXLRange range, string rangeName)
                 .ToArray();
             var cells = from c in cellsUsed
                 let value = c.GetString()
-                where (value.StartsWith("<<") || value.EndsWith(">>"))
+                where TagExtensions.HasTag(value)
                 select c;
 
             if (!_tags.ContainsKey(rangeName))
@@ -183,6 +183,9 @@ string EvalString(string str)
                         nr.NamedRange.SetRefersTo(ranges);
 
                         tplt.RangeTagsApply(trgtRng, items);
+                        var isOptionsRowEmpty = trgtRng.IsOptionsRowEmpty();
+                        if (isOptionsRowEmpty)
+                            trgtRng.LastRow().Delete(XLShiftDeletedCells.ShiftCellsUp);
                     }
 
                     // refresh ranges for pivot tables

ClosedXML.Report/RangeTemplate.cs

@@ -27,7 +27,7 @@ public class RangeTemplate
         private TempSheetBuffer _buff;
         private IXLRange _rowRange;
         private IXLRangeRow _optionsRow;
-        private bool _optionsRowIsEmpty = true;
+        private bool _isOptionsRowEmpty = true;
         private bool _isSubrange;
         private IDictionary<string, object> _globalVariables;
 
@@ -107,7 +107,7 @@ private static RangeTemplate Parse(string name, IXLRange range, TempSheetBuffer
 
                 result._rowRange = range.Offset(0, 0, result._rowCnt, result._colCnt);
                 result._optionsRow = range.LastRow();
-                result._optionsRowIsEmpty = !result._optionsRow.CellsUsed(XLCellsUsedOptions.AllContents | XLCellsUsedOptions.MergedRanges).Any();
+                result._isOptionsRowEmpty = range.IsOptionsRowEmpty();
             }
 
             result._subranges = innerRanges.SelectMany(nrng => nrng.Ranges,
@@ -219,7 +219,7 @@ private void VerticalTable(object[] items, FormulaEvaluator evaluator)
             }
 
             // Render options row
-            if (!_optionsRowIsEmpty)
+            if (!_isOptionsRowEmpty)
             {
                 foreach (var cell in _cells.Where(c => c.Row == _rowCnt + 1).OrderBy(c => c.Column))
                 {
@@ -230,7 +230,7 @@ private void VerticalTable(object[] items, FormulaEvaluator evaluator)
 
             // Execute range options tags
             var resultRange = _buff.GetRange(rangeStart, _buff.PrevAddress);
-            if (!_optionsRowIsEmpty)
+            if (!_isOptionsRowEmpty)
             {
                 var optionsRow = resultRange.LastRow().AsRange();
                 foreach (var mrg in _mergedRanges.Where(r => _optionsRow.Contains(r)))
@@ -425,8 +425,8 @@ private void ParseTags(IXLRange range)
             var innerRanges = range.GetContainingNames().ToArray();
             var cells = from c in _cells
                         let value = c.GetString()
-                        where (value.StartsWith("<<") || value.EndsWith(">>"))
-                            && !innerRanges.Any(nr => nr.Ranges.Contains(c.XLCell.AsRange()))
+                        where TagExtensions.HasTag(value)
+                              && !innerRanges.Any(nr => nr.Ranges.Contains(c.XLCell.AsRange()))
                         select c;
 
             foreach (var cell in cells)

tests/ClosedXML.Report.Tests/XlTemplateTests.cs

@@ -87,7 +87,6 @@ public void Add_enumerable_variable_should_fill_range()
                 }),
                 wb =>
                 {
-                    wb.SaveAs("Output\\4.xlsx");
                     var sheet = wb.Worksheet(1);
                     sheet.Cell("G1").GetValue<string>().Should().Be("title from test");
                     sheet.Cell("B4").GetValue<string>().Should().Be("1");