summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRi Xu <xuri.me@gmail.com>2018-04-08 10:31:11 +0800
committerRi Xu <xuri.me@gmail.com>2018-04-08 10:31:11 +0800
commit564ebe48dd660347c7ac5cdebe3395e4a085f19b (patch)
treef83770df0cdead6d540b655bf3b960b44f75f27a
parenta6fc5a721dfcb4974342603ebff8a4032c58a797 (diff)
- Fix `checkCellInArea()` index out of range when merged cell ref is single coordinate, relate issue #206;
- go test updated; - Repository icon for SourceTree has been added
-rw-r--r--cell.go4
-rw-r--r--excelize_test.go1
-rw-r--r--logo.pngbin0 -> 4208 bytes
-rw-r--r--test/Book1.xlsxbin22962 -> 22981 bytes
4 files changed, 5 insertions, 0 deletions
diff --git a/cell.go b/cell.go
index 281ab45..c5cd838 100644
--- a/cell.go
+++ b/cell.go
@@ -532,6 +532,10 @@ func checkCellInArea(cell, area string) bool {
area = strings.ToUpper(area)
ref := strings.Split(area, ":")
+ if len(ref) < 2 {
+ return false
+ }
+
from := ref[0]
to := ref[1]
diff --git a/excelize_test.go b/excelize_test.go
index efffe8c..ade3baf 100644
--- a/excelize_test.go
+++ b/excelize_test.go
@@ -332,6 +332,7 @@ func TestMergeCell(t *testing.T) {
xlsx.SetCellHyperLink("Sheet1", "J11", "https://github.com/360EntSecGroup-Skylar/excelize", "External")
xlsx.SetCellFormula("Sheet1", "G12", "SUM(Sheet1!B19,Sheet1!C19)")
xlsx.GetCellValue("Sheet1", "H11")
+ xlsx.GetCellValue("Sheet2", "A6") // Merged cell ref is single coordinate.
xlsx.GetCellFormula("Sheet1", "G12")
err = xlsx.Save()
if err != nil {
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000..4853698
--- /dev/null
+++ b/logo.png
Binary files differ
diff --git a/test/Book1.xlsx b/test/Book1.xlsx
index a8328cf..7168ff1 100644
--- a/test/Book1.xlsx
+++ b/test/Book1.xlsx
Binary files differ