Fix the error on getting the range of merged cells on the worksheet which contains one cell merged cell range

- Parse workbook default theme for custom theme color support in the feature
- Variables name typo fix
- Add system foreground and background color as RGB in the IndexedColorMapping list

1 files changed, 10 insertions, 2 deletions

diff --git a/merge.go b/merge.go
index 04dc493..a839b96 100644
--- a/merge.go
+++ b/merge.go
@@ -17,7 +17,11 @@ import "strings"
 func (mc *xlsxMergeCell) Rect() ([]int, error) {
 	var err error
 	if mc.rect == nil {
-		mc.rect, err = rangeRefToCoordinates(mc.Ref)
+		mergedCellsRef := mc.Ref
+		if !strings.Contains(mergedCellsRef, ":") {
+			mergedCellsRef += ":" + mergedCellsRef
+		}
+		mc.rect, err = rangeRefToCoordinates(mergedCellsRef)
 	}
 	return mc.rect, err
 }
@@ -105,7 +109,11 @@ func (f *File) UnmergeCell(sheet, hCell, vCell string) error {
 		if mergeCell == nil {
 			continue
 		}
-		rect2, _ := rangeRefToCoordinates(mergeCell.Ref)
+		mergedCellsRef := mergeCell.Ref
+		if !strings.Contains(mergedCellsRef, ":") {
+			mergedCellsRef += ":" + mergedCellsRef
+		}
+		rect2, _ := rangeRefToCoordinates(mergedCellsRef)
 		if isOverlap(rect1, rect2) {
 			continue
 		}