X-Git-Url: https://satomichan.jp/gitweb/?p=nucalgen;a=blobdiff_plain;f=nucalgen%2Fsrc%2Fmain%2Fjava%2Fjp%2Fsatomichan%2Fnucalgen%2FNamedAreaStore.java;fp=nucalgen%2Fsrc%2Fmain%2Fjava%2Fjp%2Fsatomichan%2Fnucalgen%2FNamedAreaStore.java;h=2f2f679c432ce0c5f1736bc894fd7dbb60dd75c7;hp=095499ea06810a9db841432003d38483d3c87627;hb=157cca3a38bee5fcb31d0e7b58ea01d728489e7f;hpb=d586a20bb25ee9d801c3a16c07ce1e4322bf44f0

diff --git a/nucalgen/src/main/java/jp/satomichan/nucalgen/NamedAreaStore.java b/nucalgen/src/main/java/jp/satomichan/nucalgen/NamedAreaStore.java
index 095499e..2f2f679 100644
--- a/nucalgen/src/main/java/jp/satomichan/nucalgen/NamedAreaStore.java
+++ b/nucalgen/src/main/java/jp/satomichan/nucalgen/NamedAreaStore.java
@@ -4,7 +4,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.regex.Matcher;
 
+import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.util.CellReference;
 
 public class NamedAreaStore {
@@ -33,7 +35,7 @@ public class NamedAreaStore {
 	
 	String save(String areaname, int row1, int col1, int row2, int col2) {
 		String area = getAreaString(row1, col1, row2, col2);
-		
+		areaname = Matcher.quoteReplacement(areaname);
 		this.namedAreaMap.put(areaname, area);
 		
 		return area;
@@ -45,7 +47,13 @@ public class NamedAreaStore {
 	}
 	
 	
+	String save(String areaname, Cell cell) {
+		return this.save(areaname, cell.getRowIndex(), cell.getColumnIndex());
+	}
+	
+	
 	String load(String areaName) {
+		areaName = Matcher.quoteReplacement(areaName);
 		return this.namedAreaMap.get(areaName);
 	}