@@ -, +, @@
---
src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java | 13 +++++++------
.../hssf/eventusermodel/TestFormatTrackingHSSFListener.java | 3 ++-
2 files changed, 9 insertions(+), 7 deletions(-)
--- a/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
+++ a/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
@@ -54,10 +54,10 @@ import java.util.Map;
* 0x26, "#,##0_);[Red](#,##0)"
* 0x27, "#,##0.00_);(#,##0.00)"
* 0x28, "#,##0.00_);[Red](#,##0.00)"
- * 0x29, "_(*#,##0_);_(*(#,##0);_(* \"-\"_);_(@_)"
- * 0x2a, "_($*#,##0_);_($*(#,##0);_($* \"-\"_);_(@_)"
- * 0x2b, "_(*#,##0.00_);_(*(#,##0.00);_(*\"-\"??_);_(@_)"
- * 0x2c, "_($*#,##0.00_);_($*(#,##0.00);_($*\"-\"??_);_(@_)"
+ * 0x29, "_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)"
+ * 0x2a, "_($* #,##0_);_($* (#,##0);_($* \"-\"_);_(@_)"
+ * 0x2b, "_(* #,##0.00_);_(* (#,##0.00);_(* \"-\"??_);_(@_)"
+ * 0x2c, "_($* #,##0.00_);_($* (#,##0.00);_($* \"-\"??_);_(@_)"
* 0x2d, "mm:ss"
* 0x2e, "[h]:mm:ss"
* 0x2f, "mm:ss.0"
@@ -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");
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
+++ a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
@@ -57,7 +57,8 @@ public final class TestFormatTrackingHSSFListener extends TestCase {
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));
}
/**
--