From 494e313b0c41f2c2492c67a517a871384f4098b6 Mon Sep 17 00:00:00 2001
From: Doria Saric <doria.saric@gmail.com>
Date: Wed, 10 Feb 2021 10:38:17 +0100
Subject: [PATCH 01/11] fix: localSheetId was always set to 0 instead of
 assigning the right worksheet index

---
 .../src/main/java/org/dhatim/fastexcel/Workbook.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
index 7bfab19f..10987226 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
@@ -204,6 +204,7 @@ private void writeWorkbookFile() throws IOException {
              * (if there are any repeating rows or cols in the sheet at all) **/
     
             for (Worksheet ws : worksheets) {
+                int index = getIndex(ws) -1;
                 String defineName = Stream.of(ws.getRepeatingCols(),ws.getRepeatingRows())
                                 .filter(Objects::nonNull)
                                 .map(r -> ws.getName() + "!" + r.toString())
@@ -212,8 +213,8 @@ private void writeWorkbookFile() throws IOException {
                     w.append("<definedNames>");
                     w.append("<definedName function=\"false\" " + 
                                 "hidden=\"false\" " +
-                                "localSheetId=\"0\" " + 
-                                "name=\"_xlnm.Print_Titles\" " + 
+                                "localSheetId=\"" + index + 
+                                "\" name=\"_xlnm.Print_Titles\" " + 
                                 "vbProcedure=\"false\">");
                     w.append(defineName);
                     w.append("</definedName>");

From 4cb3ddaf4ea9d120f1ab6a7fc9cb7ef6c4e90ba7 Mon Sep 17 00:00:00 2001
From: Doria Saric <doria.saric@gmail.com>
Date: Wed, 10 Feb 2021 10:40:06 +0100
Subject: [PATCH 02/11] new feature: name cell ranges

---
 .../main/java/org/dhatim/fastexcel/Range.java |  8 +++++++
 .../java/org/dhatim/fastexcel/Workbook.java   | 22 +++++++++++++++++--
 .../java/org/dhatim/fastexcel/Worksheet.java  | 11 ++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Range.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Range.java
index 81c4ff29..9c3195be 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Range.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Range.java
@@ -215,6 +215,14 @@ public ListDataValidation validateWithList(Range listRange) {
         return listDataValidation;
     }
 
+    /**
+     * Specifically define this range by assigning it a name.
+     * It will be visible in the cell range dropdown menu.
+     */
+    public void setName(String name) {
+        worksheet.addNamedRange(this, name);
+    }
+
     /**
      * Return the set of styles used by the cells in this range.
      *
diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
index 10987226..6546edb2 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
@@ -22,6 +22,7 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.Map;
 import java.util.stream.Stream;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
@@ -209,8 +210,9 @@ private void writeWorkbookFile() throws IOException {
                                 .filter(Objects::nonNull)
                                 .map(r -> ws.getName() + "!" + r.toString())
                                 .collect(Collectors.joining(","));
+                
+                w.append("<definedNames>");
                 if (!defineName.isEmpty()) {
-                    w.append("<definedNames>");
                     w.append("<definedName function=\"false\" " + 
                                 "hidden=\"false\" " +
                                 "localSheetId=\"" + index + 
@@ -218,8 +220,24 @@ private void writeWorkbookFile() throws IOException {
                                 "vbProcedure=\"false\">");
                     w.append(defineName);
                     w.append("</definedName>");
-                    w.append("</definedNames>");
                 }
+                /** define specifically named ranges **/
+                for (Map.Entry<String, Range> nr : ws.getNamedRanges().entrySet()) {
+                    String rangeName = nr.getKey();
+                    Range range = nr.getValue();
+                    w.append("<definedName function=\"false\" " + 
+                                "hidden=\"false\" " + 
+                                "name=\"")
+                        .append(rangeName)
+                        .append("\" vbProcedure=\"false\">")
+                        .append(ws.getName())
+                        .append("!")
+                        .append("$" + Range.colToString(range.getLeft()) + "$" + (1 + range.getTop()))
+                        .append(":")
+                        .append("$" + Range.colToString(range.getRight()) + "$" + (1 + range.getBottom()))
+                        .append("</definedName>");
+                }
+                w.append("</definedNames>");
             }
             w.append("</workbook>");
         });
diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
index 85b35f9f..0dae2700 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
@@ -204,6 +204,10 @@ public class Worksheet {
      * Range of row where will be inserted auto filter
      */
     private Range autoFilterRange = null;
+    /**
+     * List of named ranges.
+     */
+    private Map<String, Range> namedRanges = new LinkedHashMap();
 
     /**
      * The set of protection options that are applied on the sheet.
@@ -258,6 +262,13 @@ public RepeatColRange getRepeatingCols(){
         return repeatingCols;
     }
 
+    /**
+     * Get a list of named ranges.
+     */
+    public Map<String, Range> getNamedRanges() {
+        return namedRanges;
+    }
+
     /**
      * Get parent workbook.
      *

From 999968d3095d2d0af341fa337951380ebe7b23df Mon Sep 17 00:00:00 2001
From: Doria Saric <doria.saric@gmail.com>
Date: Wed, 10 Feb 2021 10:41:58 +0100
Subject: [PATCH 03/11] added forgotten function for named ranges functionality

---
 .../src/main/java/org/dhatim/fastexcel/Worksheet.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
index 0dae2700..7a253136 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
@@ -1220,4 +1220,14 @@ public void header(String text, Position position) {
         this.header.put(position, "&amp;" + position.getPos() +
                                   prepareForXml(text));
     }
+
+    /**
+     * Add the given range to this sheet's
+     * list of named ranges under the provided name.
+     * It will be visible when this sheet is open in the
+     * cell range dropdown menu under the specified name.
+     */
+    public void addNamedRange(Range range, String name) {
+        this.namedRanges.put(name, range);
+    }
 }

From e37970506b881d267dd5ec824cb6b54750d96b4a Mon Sep 17 00:00:00 2001
From: Doria Saric <doria.saric@gmail.com>
Date: Wed, 10 Feb 2021 10:43:25 +0100
Subject: [PATCH 04/11] defined a specific name range that LibreOffice needs to
 recognize autofilter in a generated XLSX file

---
 .../src/main/java/org/dhatim/fastexcel/Workbook.java | 12 ++++++++++++
 .../main/java/org/dhatim/fastexcel/Worksheet.java    |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
index 6546edb2..195bbc14 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
@@ -237,6 +237,18 @@ private void writeWorkbookFile() throws IOException {
                         .append("$" + Range.colToString(range.getRight()) + "$" + (1 + range.getBottom()))
                         .append("</definedName>");
                 }
+                Range af = ws.getAutoFilterRange();
+                if (af != null) {
+                    w.append("<definedName function=\"false\" hidden=\"true\" localSheetId=\"")
+                    .append(index)
+                    .append("\" name=\"_xlnm._FilterDatabase\" vbProcedure=\"false\">")
+                    .append(ws.getName())
+                    .append("!")
+                    .append("$" + Range.colToString(af.getLeft()) + "$" + (1 + af.getTop()))
+                    .append(":")
+                    .append("$" + Range.colToString(af.getRight()) + "$" + (1 + af.getBottom()))
+                    .append("</definedName>");
+                }
                 w.append("</definedNames>");
             }
             w.append("</workbook>");
diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
index 7a253136..10f7dcaf 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
@@ -252,6 +252,10 @@ public RepeatRowRange getRepeatingRows(){
         return repeatingRows;
     }
 
+    public Range getAutoFilterRange(){
+        return autoFilterRange;
+    }
+
     /**
      * Get repeating cols defined for the print setup.
      *

From 99df6bb3e33a6e245a406ffd2af6ff0b2643b5f1 Mon Sep 17 00:00:00 2001
From: Doria Saric <doria.saric@gmail.com>
Date: Wed, 10 Feb 2021 10:46:17 +0100
Subject: [PATCH 05/11] aesthetics: added some comments

---
 .../src/main/java/org/dhatim/fastexcel/Worksheet.java       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
index 10f7dcaf..16d4102d 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
@@ -252,6 +252,12 @@ public RepeatRowRange getRepeatingRows(){
         return repeatingRows;
     }
 
+    /**
+     * Get cell range that autofilter is applied to.
+     * 
+     * @return Range of cells that autofilter is set to
+     *             (null if autofilter is not set).
+     */
     public Range getAutoFilterRange(){
         return autoFilterRange;
     }

From 4a26534d1cead82b9fc43fad15a859f34ee8cee5 Mon Sep 17 00:00:00 2001
From: Doria Saric <doria.saric@gmail.com>
Date: Wed, 10 Feb 2021 10:52:34 +0100
Subject: [PATCH 06/11] fix: in case the sheetname contains a space or any
 other odd characters the defined named range for LibreOffice autofilter would
 not have been properly defined

---
 .../src/main/java/org/dhatim/fastexcel/Workbook.java            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
index 195bbc14..a3ff6d7b 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
@@ -242,7 +242,9 @@ private void writeWorkbookFile() throws IOException {
                     w.append("<definedName function=\"false\" hidden=\"true\" localSheetId=\"")
                     .append(index)
                     .append("\" name=\"_xlnm._FilterDatabase\" vbProcedure=\"false\">")
+                    .append("&apos;")
                     .append(ws.getName())
+                    .append("&apos;")
                     .append("!")
                     .append("$" + Range.colToString(af.getLeft()) + "$" + (1 + af.getTop()))
                     .append(":")

From 4fc9dd2de809946f2c7b58526194b441feaec01c Mon Sep 17 00:00:00 2001
From: Doria Saric <doria.saric@gmail.com>
Date: Wed, 10 Feb 2021 10:59:09 +0100
Subject: [PATCH 07/11] improved javadoc comments for named range functions

---
 .../src/main/java/org/dhatim/fastexcel/Range.java           | 2 ++
 .../src/main/java/org/dhatim/fastexcel/Worksheet.java       | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Range.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Range.java
index 9c3195be..78089106 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Range.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Range.java
@@ -218,6 +218,8 @@ public ListDataValidation validateWithList(Range listRange) {
     /**
      * Specifically define this range by assigning it a name.
      * It will be visible in the cell range dropdown menu.
+     * 
+     * @param name string representing the name of this cell range
      */
     public void setName(String name) {
         worksheet.addNamedRange(this, name);
diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
index 16d4102d..2b70857e 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
@@ -274,6 +274,8 @@ public RepeatColRange getRepeatingCols(){
 
     /**
      * Get a list of named ranges.
+     * 
+     * @return Map containing <name, cell range> entries.
      */
     public Map<String, Range> getNamedRanges() {
         return namedRanges;
@@ -1236,6 +1238,10 @@ public void header(String text, Position position) {
      * list of named ranges under the provided name.
      * It will be visible when this sheet is open in the
      * cell range dropdown menu under the specified name.
+     * 
+     * @param range Range of cells that needs to be named.
+     * @param name String representing the given cell range's name.
+     * 
      */
     public void addNamedRange(Range range, String name) {
         this.namedRanges.put(name, range);

From d4e3d2711ab2923e5fa5a5be4f795233c9c24905 Mon Sep 17 00:00:00 2001
From: Doria Saric <doria.saric@gmail.com>
Date: Wed, 10 Feb 2021 11:09:13 +0100
Subject: [PATCH 08/11] corrected invalid javadoc comment

---
 .../src/main/java/org/dhatim/fastexcel/Worksheet.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
index 2b70857e..1e3e423b 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
@@ -275,7 +275,8 @@ public RepeatColRange getRepeatingCols(){
     /**
      * Get a list of named ranges.
      * 
-     * @return Map containing <name, cell range> entries.
+     * @return Map containing named range entries 
+     *              where keys are the names and values are cell ranges.
      */
     public Map<String, Range> getNamedRanges() {
         return namedRanges;

From fe6beefb59ad9135eab0fbf090f218ae4d9df060 Mon Sep 17 00:00:00 2001
From: Doria Saric <doria.saric@gmail.com>
Date: Wed, 10 Feb 2021 14:54:56 +0100
Subject: [PATCH 09/11] fix: when sheetname contains space or some other
 non-alphabetical character the repeating rows definition is not defined
 correctly

---
 .../java/org/dhatim/fastexcel/Workbook.java   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
index a3ff6d7b..bf426d6e 100644
--- a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
+++ b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Workbook.java
@@ -205,32 +205,32 @@ private void writeWorkbookFile() throws IOException {
              * (if there are any repeating rows or cols in the sheet at all) **/
     
             for (Worksheet ws : worksheets) {
-                int index = getIndex(ws) -1;
+                int worksheetIndex = getIndex(ws) - 1;                
                 String defineName = Stream.of(ws.getRepeatingCols(),ws.getRepeatingRows())
                                 .filter(Objects::nonNull)
-                                .map(r -> ws.getName() + "!" + r.toString())
+                                .map(r -> "&apos;" + ws.getName() + "&apos;!" + r.toString())
                                 .collect(Collectors.joining(","));
                 
                 w.append("<definedNames>");
                 if (!defineName.isEmpty()) {
                     w.append("<definedName function=\"false\" " + 
-                                "hidden=\"false\" " +
-                                "localSheetId=\"" + index + 
-                                "\" name=\"_xlnm.Print_Titles\" " + 
-                                "vbProcedure=\"false\">");
-                    w.append(defineName);
-                    w.append("</definedName>");
+                                "hidden=\"false\" localSheetId=\"" + 
+                                worksheetIndex + "\" name=\"_xlnm.Print_Titles\" " + 
+                                "vbProcedure=\"false\">")
+                     .append(defineName)
+                     .append("</definedName>");
                 }
                 /** define specifically named ranges **/
                 for (Map.Entry<String, Range> nr : ws.getNamedRanges().entrySet()) {
                     String rangeName = nr.getKey();
                     Range range = nr.getValue();
                     w.append("<definedName function=\"false\" " + 
-                                "hidden=\"false\" " + 
-                                "name=\"")
+                                "hidden=\"false\" localSheetId=\"" + 
+                                worksheetIndex + "\" name=\"")
                         .append(rangeName)
-                        .append("\" vbProcedure=\"false\">")
+                        .append("\" vbProcedure=\"false\">&apos;")
                         .append(ws.getName())
+                        .append("&apos;")
                         .append("!")
                         .append("$" + Range.colToString(range.getLeft()) + "$" + (1 + range.getTop()))
                         .append(":")
@@ -240,7 +240,7 @@ private void writeWorkbookFile() throws IOException {
                 Range af = ws.getAutoFilterRange();
                 if (af != null) {
                     w.append("<definedName function=\"false\" hidden=\"true\" localSheetId=\"")
-                    .append(index)
+                    .append(worksheetIndex)
                     .append("\" name=\"_xlnm._FilterDatabase\" vbProcedure=\"false\">")
                     .append("&apos;")
                     .append(ws.getName())

From 590303be855d8aab684f537db54a9d981c1e508a Mon Sep 17 00:00:00 2001
From: Doria <doria.saric@gmail.com>
Date: Wed, 10 Feb 2021 15:39:16 +0100
Subject: [PATCH 10/11] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index bc46b592..0f9b7d6b 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,10 @@ or shade every Nth row (e.g. every 5th):
 ```java
 ws.range(0, 0, 10, 10).style().shadeRows(Color.GRAY2, 5).set();
 ```
+Name a cell range (name of a cell range can only include letters, numbers and underscore):
+```java
+ws.range(0, 0, 0, 10).setName("header");
+```
 
 ### Formulas
 

From 51d776aa70277d686683fd566330f6e565a0b611 Mon Sep 17 00:00:00 2001
From: Doria Saric <doria.saric@gmail.com>
Date: Mon, 8 Mar 2021 11:42:01 +0100
Subject: [PATCH 11/11] added a new test validating named range functionality
 with Apache POI

---
 .../fastexcel/PoiCompatibilityTest.java       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/fastexcel-writer/src/test/java/org/dhatim/fastexcel/PoiCompatibilityTest.java b/fastexcel-writer/src/test/java/org/dhatim/fastexcel/PoiCompatibilityTest.java
index 08642738..f499c1d7 100644
--- a/fastexcel-writer/src/test/java/org/dhatim/fastexcel/PoiCompatibilityTest.java
+++ b/fastexcel-writer/src/test/java/org/dhatim/fastexcel/PoiCompatibilityTest.java
@@ -630,4 +630,31 @@ private static boolean isWorkSheetDisplayingGridLines(byte[] data) throws IOExce
         return xws.isDisplayGridlines();
     }
 
+    @Test
+    void hasValidNamedRange() throws Exception {
+
+        byte[] data = writeWorkbook(wb -> {
+            Worksheet ws = wb.newWorksheet("Worksheet 1");
+            ws.value(0, 1, "column 1");
+            ws.value(0, 2, "column 2");
+            ws.value(0, 3, "column 3");
+            ws.value(1, 1, "value 1");
+            ws.value(1, 2, "value 2");
+            ws.value(1, 3, "value 3");
+            ws.range(0, 0, 1, 3).setName("col names");
+        });
+
+        // Check generated workbook with Apache POI
+        XSSFWorkbook xwb = new XSSFWorkbook(new ByteArrayInputStream(data));
+        XSSFSheet xws = xwb.getSheetAt(0);
+        // Fetch the XSSF Name object
+        XSSFName name = xwb.getName("col names");
+        String formula = name.getRefersToFormula();
+        
+        assertTrue(name != null);
+        assertTrue(name.getNameName().equals("col names"));
+        assertTrue(formula.equals("'Worksheet 1'!$A$1:$D$2"));
+    }
+
+
 }