Fix bug #51963 - Correct AreaReference handling of references containing a sheet name which includes a comma

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1179444 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 5 deletions

diff --git a/src/java/org/apache/poi/ss/util/AreaReference.java b/src/java/org/apache/poi/ss/util/AreaReference.java
index ffa0c8888d..2082634d18 100644
--- a/src/java/org/apache/poi/ss/util/AreaReference.java
+++ b/src/java/org/apache/poi/ss/util/AreaReference.java
@@ -152,13 +152,20 @@ public class AreaReference {
      *  unbroken) area, or is it made up of
      *  several different parts?
      * (If it is, you will need to call
-     *  ....
+     *  {@link #generateContiguous(String)})
      */
     public static boolean isContiguous(String reference) {
-        if(reference.indexOf(',') == -1) {
-            return true;
-        }
-        return false;
+       // If there's a sheet name, strip it off
+       int sheetRefEnd = reference.indexOf('!'); 
+       if(sheetRefEnd != -1) {
+          reference = reference.substring(sheetRefEnd);
+       }
+
+       // Check for the , as a sign of non-coniguous
+       if(reference.indexOf(',') == -1) {
+          return true;
+       }
+       return false;
     }
 
     public static AreaReference getWholeRow(String start, String end) {