Small fixes and cleanups (#74)

* pivot small fixes

* more small fixes for pivot

Author: b0bi79

ClosedXML.Report/Excel/Subtotal.cs

@@ -71,9 +71,8 @@ public void GroupBy(int groupBy, SubtotalSummaryFunc[] summaries, bool pageBreak
             _pageBreaks = pageBreaks;
             _getGroupLabel = getGroupLabel;
 
-            int level;
             var rows = Sheet.Rows(_range.RangeAddress.FirstAddress.RowNumber, _range.RangeAddress.LastAddress.RowNumber);
-            level = Math.Min(8, rows.Max(r => r.OutlineLevel) + 1);
+            var level = Math.Min(8, rows.Max(r => r.OutlineLevel) + 1);
 
             var grRanges = ScanRange(groupBy);
             int grCnt = grRanges.Count(x => x.Type == RangeType.DataRange);
@@ -302,9 +301,8 @@ public SubtotalGroup[] ScanForGroups(int groupBy)
         {
             var grRanges = ScanRange(groupBy);
             var result = new List<SubtotalGroup>(grRanges.Length);
-            int level;
             var rows = Sheet.Rows(_range.RangeAddress.FirstAddress.RowNumber, _range.RangeAddress.LastAddress.RowNumber);
-            level = Math.Min(8, rows.Max(r => r.OutlineLevel) + 1);
+            var level = Math.Min(8, rows.Max(r => r.OutlineLevel) + 1);
 
             foreach (var moveData in grRanges)
             {

ClosedXML.Report/Excel/XlExtensions.cs

@@ -301,7 +301,9 @@ public static void ReplaceCFFormulaeToA1(this IXLWorksheet worksheet)
         {
             foreach (var format in worksheet.ConditionalFormats)
             {
-                var target = format.Range.FirstCell();
+                var target = format.Ranges.OrderBy(x=>x.RangeAddress.FirstAddress.RowNumber)
+                    .ThenBy(x=> x.RangeAddress.FirstAddress.ColumnNumber)
+                    .First().FirstCell();
                 foreach (var v in format.Values.Where(v => v.Value.Value.StartsWith("&=")).ToList())
                 {
                     var f = v.Value.Value.Substring(1);

ClosedXML.Report/Options/OnlyValuesTag.cs

@@ -6,7 +6,6 @@ OPTION          OBJECTS
 ================================================
 */
 
-using ClosedXML.Excel;
 using MoreLinq;
 
 namespace ClosedXML.Report.Options

ClosedXML.Report/Options/PivotTag.cs

@@ -189,7 +189,8 @@ private void BuildFormatting(PivotTag pivot, DataPivotTag tag, IXLPivotValue pf)
 
         private IXLPivotTable CreatePivot(PivotTag pivot, ProcessingContext context, IXLWorksheet targetSheet, string tableName, IXLCell targetCell)
         {
-            IXLRange srcRange = context.Range.Offset(-1, 1, context.Range.RowCount(), context.Range.ColumnCount() - 1);
+            var rowOffset = context.Range.RangeAddress.FirstAddress.RowNumber > 1 ? -1 : 0;
+            IXLRange srcRange = context.Range.Offset(rowOffset, 1, context.Range.RowCount(), context.Range.ColumnCount() - 1);
             var pt = targetSheet.PivotTables.Add(tableName, targetCell, srcRange);
             pt.MergeAndCenterWithLabels = pivot.HasParameter("MergeLabels");
             pt.ShowExpandCollapseButtons = pivot.HasParameter("ShowButtons");

ClosedXML.Report/Options/ProtectedTag.cs

@@ -7,7 +7,6 @@ OPTION          PARAMS                OBJECTS
 ================================================
 */
 using System;
-using System.Collections;
 using ClosedXML.Excel;
 using ClosedXML.Report.Excel;
 using MoreLinq;

ClosedXML.Report/RangeInterpreter.cs

@@ -1,6 +1,6 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using ClosedXML.Excel;
@@ -17,7 +17,7 @@ internal class RangeInterpreter
         private readonly string _alias;
         private readonly FormulaEvaluator _evaluator;
         private readonly TagsEvaluator _tagsEvaluator;
-        private readonly Dictionary<string, object> _variables = new Dictionary<string, object>();
+        private readonly Dictionary<string, object> _variables = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
         private readonly Dictionary<string, TagsList> _tags = new Dictionary<string, TagsList>();
         private readonly TemplateErrors _errors;