#161 Name Manager chose sheet scope not workbook scope then Enumerable extend will not work (#222)

Author: b0bi79

ClosedXML.Report/Excel/XlExtensions.cs

@@ -40,7 +40,8 @@ public static class XlExtensions
         /// <param name="range">range</param>
         public static IEnumerable<IXLNamedRange> GetContainerNames(this IXLRange range)
         {
-            return range.Worksheet.Workbook.NamedRanges.Where(x => x.Ranges.Where(r => !r.Equals(range)).Any(r => r.Contains(range)));
+            return range.Worksheet.Workbook.NamedRanges.Where(x => GetContainingRanges(x, range))
+                .Union(range.Worksheet.NamedRanges.Where(x => GetContainingRanges(x, range)));
         }
 
         public static bool Contains(this IXLRangeAddress rangeAddress, IXLAddress address)
@@ -121,8 +122,13 @@ internal static KeyValuePair<string, IXLRangeAddress>[] GetRangeParameters(this
         /// <param name="range">range</param>
         public static IEnumerable<IXLNamedRange> GetContainingNames(this IXLRange range)
         {
-            return range.Worksheet.Workbook.NamedRanges.Where(x => x.Ranges.Where(r => r.Worksheet.Position == range.Worksheet.Position
-                                                                                       && !r.Equals(range)).Any(range.Contains));
+            return range.Worksheet.NamedRanges.Where(x => GetContainingRanges(x, range))
+                .Union(range.Worksheet.Workbook.NamedRanges.Where(x => GetContainingRanges(x, range)));
+        }
+
+        private static bool GetContainingRanges(IXLNamedRange x, IXLRange xlRange)
+        {
+            return x.Ranges.Where(r => r.Worksheet.Position == xlRange.Worksheet.Position && !r.Equals(xlRange)).Any(xlRange.Contains);
         }
 
         /// <summary>

ClosedXML.Report/RangeTemplate.cs

@@ -48,13 +48,13 @@ internal RangeTemplate(string name, IXLRange range, TempSheetBuffer buff, Templa
             Name = name;
             Source = name;
             var rangeName = name + "_tpl";
-            if (wb.NamedRanges.TryGetValue(rangeName, out var namedRange))
+            if (range.Worksheet.NamedRanges.TryGetValue(rangeName, out var namedRange) || wb.NamedRanges.TryGetValue(rangeName, out namedRange))
             {
                 namedRange.Add(range);
             }
             else
             {
-                wb.NamedRanges.Add(rangeName, range);
+                range.Worksheet.NamedRanges.Add(rangeName, range);
             }
 
             _evaluator = new FormulaEvaluator();