You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2012/02/27 16:21:41 UTC

svn commit: r1294180 - in /poi/trunk/src: java/org/apache/poi/ss/util/WorkbookUtil.java testcases/org/apache/poi/ss/util/TestWorkbookUtil.java

Author: yegor
Date: Mon Feb 27 15:21:40 2012
New Revision: 1294180

URL: http://svn.apache.org/viewvc?rev=1294180&view=rev
Log:
Bugzilla 52583 - fixed WorkbookUtil#createSafeSheetName to escape colon

Modified:
    poi/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java
    poi/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java

Modified: poi/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java?rev=1294180&r1=1294179&r2=1294180&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java Mon Feb 27 15:21:40 2012
@@ -35,7 +35,7 @@ public class WorkbookUtil {
 	 * <li>never null</li>
 	 * <li>minimum length is 1</li>
 	 * <li>maximum length is 31</li>
-	 * <li>doesn't contain special chars: / \ ? * ] [ </li>
+	 * <li>doesn't contain special chars: : 0x0000, 0x0003, / \ ? * ] [ </li>
 	 * <li>Sheet names must not begin or end with ' (apostrophe)</li>
 	 * </ul>
 	 * Invalid characters are replaced by one space character ' '.
@@ -57,6 +57,9 @@ public class WorkbookUtil {
 		for (int i=0; i<length; i++) {
 			char ch = result.charAt(i);
 			switch (ch) {
+                case '\u0000':
+                case '\u0003':
+                case ':':
 				case '/':
 				case '\\':
 				case '?':

Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java?rev=1294180&r1=1294179&r2=1294180&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java Mon Feb 27 15:21:40 2012
@@ -80,5 +80,8 @@ public final class TestWorkbookUtil exte
 		
 		actual = WorkbookUtil.createSafeSheetName("1234567890123456789012345678901TOOLONG");
 		assertEquals("1234567890123456789012345678901", actual);
+
+        actual = WorkbookUtil.createSafeSheetName("sheet:a4");
+        assertEquals("sheet a4", actual);
 	}
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org