Author: tallison
Date: Thu Apr 27 16:18:25 2017
New Revision: 1792918
URL: http://svn.apache.org/viewvc?rev=1792918&view=rev
Log:
bug 61049 fix ordering of builtin formulas
Modified:
poi/site/src/documentation/content/xdocs/status.xml
poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
Modified: poi/site/src/documentation/content/xdocs/status.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/status.xml?rev=1792918&r1=1792917&r2=1792918&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/status.xml (original)
+++ poi/site/src/documentation/content/xdocs/status.xml Thu Apr 27 16:18:25 2017
@@ -58,6 +58,7 @@
<release version="3.17-beta1" date="2017-07-??">
<actions>
+ <action dev="PD" type="fix" fixes-bug="61049" module="SS">Fix order of
two built-in formats</action>
<action dev="PD" type="add" fixes-bug="61021" module="XSSF">Extract
Excel 2013 absPath info from xlsb</action>
<action dev="PD" type="fix" fixes-bug="60998"
module="HSLF">HSLFTable.setRowHeight sets row height incorrect</action>
<action dev="PD" type="fix" fixes-bug="60996" module="XSSF">Multiple
embedded objects on same sheet are ignored</action>
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=1792918&r1=1792917&r2=1792918&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 Thu Apr
27 16:18:25 2017
@@ -113,8 +113,8 @@ public final class BuiltinFormats {
"#,##0_);[Red](#,##0)",
"#,##0.00_);(#,##0.00)",
"#,##0.00_);[Red](#,##0.00)",
+ "_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)",
"_(\"$\"* #,##0_);_(\"$\"* (#,##0);_(\"$\"* \"-\"_);_(@_)",
- "_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)",
"_(* #,##0.00_);_(* (#,##0.00);_(* \"-\"??_);_(@_)",
"_(\"$\"* #,##0.00_);_(\"$\"* (#,##0.00);_(\"$\"* \"-\"??_);_(@_)",
"mm:ss",
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=1792918&r1=1792917&r2=1792918&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
Thu Apr 27 16:18:25 2017
@@ -55,8 +55,8 @@ public final class TestFormatTrackingHSS
public void testFormats() throws Exception {
processFile("MissingBits.xls");
- assertEquals("_(\"$\"* #,##0_);_(\"$\"* (#,##0);_(\"$\"*
\"-\"_);_(@_)", listener.getFormatString(41));
- assertEquals("_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(@_)",
listener.getFormatString(42));
+ 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(44));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]