From: Tim Allison <tallison@apache.org>
Date: Thu, 27 Apr 2017 16:18:25 +0000 (+0000)
Subject: bug 61049 fix ordering of builtin formulas
X-Git-Tag: REL_3_17_BETA1~114
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=62ce8f211e9d34ac9e522d53a61da675391baa32;p=poi.git

bug 61049 fix ordering of builtin formulas

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

diff --git a/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java b/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
index 8d11881785..4561476b25 100644
--- a/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
+++ b/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
@@ -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",
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
index ec1e9d0c20..e617735b6a 100644
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
+++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
@@ -55,8 +55,8 @@ public final class TestFormatTrackingHSSFListener {
 	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));
 	}