acoliver 2002/09/10 19:30:43
Modified: src/java/org/apache/poi/hssf/usermodel HSSFDataFormat.java
src/testcases/org/apache/poi/hssf/usermodel
TestWorkbook.java
Log:
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12349
Revision Changes Path
1.4 +10 -0
jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
Index: HSSFDataFormat.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HSSFDataFormat.java 6 Sep 2002 04:08:30 -0000 1.3
+++ HSSFDataFormat.java 11 Sep 2002 02:30:42 -0000 1.4
@@ -62,6 +62,7 @@
import java.util.Vector;
import java.util.List;
import java.util.ListIterator;
+import java.util.Iterator;
import org.apache.poi.hssf.model.Workbook;
import org.apache.poi.hssf.record.Record;
@@ -133,6 +134,15 @@
public HSSFDataFormat(Workbook workbook) {
this.workbook = workbook;
if (builtinFormats == null) populateBuiltinFormats();
+ Iterator i = workbook.getFormats().iterator();
+ while (i.hasNext()) {
+ FormatRecord r = (FormatRecord)i.next();
+ if (formats.size() < r.getIndexCode() + 1) {
+ formats.setSize(r.getIndexCode() + 1);
+ }
+ formats.set(r.getIndexCode(), r.getFormatString());
+ }
+
}
private static synchronized void populateBuiltinFormats()
1.6 +5 -4
jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
Index: TestWorkbook.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestWorkbook.java 2 Sep 2002 02:11:16 -0000 1.5
+++ TestWorkbook.java 11 Sep 2002 02:30:43 -0000 1.6
@@ -249,12 +249,13 @@
HSSFWorkbook workbook = new HSSFWorkbook(fs);
HSSFSheet sheet = workbook.getSheetAt(0);
HSSFDataFormat format = workbook.createDataFormat();
+ HSSFCell cell =
+ sheet.getRow(( short ) 0).getCell(( short ) 0);
- assertEquals(1.25,
- sheet.getRow(( short ) 0).getCell(( short ) 0)
- .getNumericCellValue(), 1e-10);
+ assertEquals(1.25,cell.getNumericCellValue(), 1e-10);
+
- assertEquals(format.getFormat("0.0"), 0xa4);
+ assertEquals(format.getFormat(cell.getCellStyle().getDataFormat()), "0.0");
stream.close();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
