Author: yegor
Date: Tue Dec 24 05:58:23 2013
New Revision: 1553247
URL: http://svn.apache.org/r1553247
Log:
patch 55730: Fix org.apache.poi.ss.usermodel.BuiltinFormats.java for 0x29-0x2c
Modified:
poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java?rev=1553247&r1=1553246&r2=1553247&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java Tue Dec
24 05:58:23 2013
@@ -54,10 +54,10 @@ import java.util.Map;
* 0x26, "#,##0_);[Red](#,##0)"<br/>
* 0x27, "#,##0.00_);(#,##0.00)"<br/>
* 0x28, "#,##0.00_);[Red](#,##0.00)"<br/>
- * 0x29, "_(*#,##0_);_(*(#,##0);_(* \"-\"_);_(@_)"<br/>
- * 0x2a, "_($*#,##0_);_($*(#,##0);_($* \"-\"_);_(@_)"<br/>
- * 0x2b, "_(*#,##0.00_);_(*(#,##0.00);_(*\"-\"??_);_(@_)"<br/>
- * 0x2c, "_($*#,##0.00_);_($*(#,##0.00);_($*\"-\"??_);_(@_)"<br/>
+ * 0x29, "_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)"<br/>
+ * 0x2a, "_($* #,##0_);_($* (#,##0);_($* \"-\"_);_(@_)"<br/>
+ * 0x2b, "_(* #,##0.00_);_(* (#,##0.00);_(* \"-\"??_);_(@_)"<br/>
+ * 0x2c, "_($* #,##0.00_);_($* (#,##0.00);_($* \"-\"??_);_(@_)"<br/>
* 0x2d, "mm:ss"<br/>
* 0x2e, "[h]:mm:ss"<br/>
* 0x2f, "mm:ss.0"<br/>
@@ -69,6 +69,7 @@ import java.util.Map;
* @author Yegor Kozlov
*
* Modified 6/17/09 by Stanislav Shor - positive formats don't need starting
'('
+ * Modified 10/31/13 by Eric Peters - * is a repeating/padding character
directive, examples needed a space after the asterix (e.i. Accounting format)
*
*/
public final class BuiltinFormats {
@@ -137,8 +138,8 @@ public final class BuiltinFormats {
putFormat(m, 0x28, "#,##0.00_);[Red](#,##0.00)");
putFormat(m, 0x29, "_(\"$\"* #,##0_);_(\"$\"* (#,##0);_(\"$\"*
\"-\"_);_(@_)");
putFormat(m, 0x2a, "_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)");
- putFormat(m, 0x2b, "_(\"$\"* #,##0.00_);_(\"$\"*
(#,##0.00);_(\"$\"* \"-\"??_);_(@_)");
- putFormat(m, 0x2c, "_(* #,##0.00_);_(* (#,##0.00);_(*
\"-\"??_);_(@_)");
+ putFormat(m, 0x2b, "_(* #,##0.00_);_(* (#,##0.00);_(*
\"-\"??_);_(@_)");
+ putFormat(m, 0x2c, "_(\"$\"* #,##0.00_);_(\"$\"*
(#,##0.00);_(\"$\"* \"-\"??_);_(@_)");
putFormat(m, 0x2d, "mm:ss");
putFormat(m, 0x2e, "[h]:mm:ss");
putFormat(m, 0x2f, "mm:ss.0");
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java?rev=1553247&r1=1553246&r2=1553247&view=diff
==============================================================================
---
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
Tue Dec 24 05:58:23 2013
@@ -57,7 +57,8 @@ public final class TestFormatTrackingHSS
assertEquals("_(\"$\"* #,##0_);_(\"$\"* (#,##0);_(\"$\"*
\"-\"_);_(@_)", listener.getFormatString(41));
assertEquals("_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)",
listener.getFormatString(42));
- assertEquals("_(\"$\"* #,##0.00_);_(\"$\"* (#,##0.00);_(\"$\"*
\"-\"??_);_(@_)", listener.getFormatString(43));
+ assertEquals("_(* #,##0.00_);_(* (#,##0.00);_(*
\"-\"??_);_(@_)", listener.getFormatString(43));
+ assertEquals("_(\"$\"* #,##0.00_);_(\"$\"* (#,##0.00);_(\"$\"*
\"-\"??_);_(@_)", listener.getFormatString(44));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
