- * Description: the default characterset. for the workbook
- * REFERENCE: PG 293 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
- * @author Andrew C. Oliver (acoliver at apache dot org) + * Title: Codepage Record + *
Description: the default characterset. for the workbook
+ *REFERENCE: PG 293 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)
+ *Use {@link CodePageUtil} to turn these values into Java code pages + * to encode/decode strings.
* @version 2.0-pre */ @@ -36,11 +38,10 @@ public final class CodepageRecord private short field_1_codepage; // = 0; /** - * the likely correct value for CODEPAGE (at least for US versions). We could use - * some help with international versions (which we do not have access to documentation - * for) + * Excel 97+ (Biff 8) should always store strings as UTF-16LE or + * compressed versions of that. As such, this should always be + * 0x4b0 = UTF_16, except for files coming from older versions. */ - public final static short CODEPAGE = ( short ) 0x4b0; public CodepageRecord() diff --git a/src/java/org/apache/poi/hssf/record/OldLabelRecord.java b/src/java/org/apache/poi/hssf/record/OldLabelRecord.java index 7c9aaace18..ad6772382f 100644 --- a/src/java/org/apache/poi/hssf/record/OldLabelRecord.java +++ b/src/java/org/apache/poi/hssf/record/OldLabelRecord.java @@ -32,9 +32,9 @@ public final class OldLabelRecord extends OldCellRecord { public final static short biff2_sid = 0x0004; public final static short biff345_sid = 0x0204; - private short field_4_string_len; - private byte[] field_5_bytes; - //private XXXXX codepage; // TODO Implement for this and OldStringRecord + private short field_4_string_len; + private byte[] field_5_bytes; + private CodepageRecord codepage; /** * @param in the RecordInputstream to read the record from @@ -61,6 +61,10 @@ public final class OldLabelRecord extends OldCellRecord { } } + public void setCodePage(CodepageRecord codepage) { + this.codepage = codepage; + } + /** * get the number of characters this string contains * @return number of characters @@ -75,8 +79,7 @@ public final class OldLabelRecord extends OldCellRecord { */ public String getValue() { - // We really need the codepage here to do this right... - return new String(field_5_bytes); + return OldStringRecord.getString(field_5_bytes, codepage); } /** diff --git a/src/java/org/apache/poi/hssf/record/OldStringRecord.java b/src/java/org/apache/poi/hssf/record/OldStringRecord.java index 42549e2c2e..d4296ba639 100644 --- a/src/java/org/apache/poi/hssf/record/OldStringRecord.java +++ b/src/java/org/apache/poi/hssf/record/OldStringRecord.java @@ -17,6 +17,10 @@ package org.apache.poi.hssf.record; +import java.io.UnsupportedEncodingException; + +import org.apache.poi.util.CodePageUtil; + /** * Biff2 - Biff 4 Label Record (0x0007 / 0x0207) - read only support for @@ -29,7 +33,7 @@ public final class OldStringRecord { private short sid; private short field_1_string_len; private byte[] field_2_bytes; - //private XXXXX codepage; // TODO Implement for this and OldLabelRecord + private CodepageRecord codepage; /** * @param in the RecordInputstream to read the record from @@ -55,14 +59,30 @@ public final class OldStringRecord { public short getSid() { return sid; } + + public void setCodePage(CodepageRecord codepage) { + this.codepage = codepage; + } /** * @return The string represented by this record. */ public String getString() { - // We really need the codepage here to do this right... - return new String(field_2_bytes); + return getString(field_2_bytes, codepage); + } + + protected static String getString(byte[] data, CodepageRecord codepage) { + int cp = CodePageUtil.CP_ISO_8859_1; + if (codepage != null) { + cp = codepage.getCodepage(); + } + try { + return CodePageUtil.getStringFromCodePage(data, cp); + } catch (UnsupportedEncodingException uee) { + // Hope the system default is ok... + return new String(data); + } } public String toString() diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java b/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java index 8742b92dcd..d57129265c 100644 --- a/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java +++ b/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java @@ -81,8 +81,7 @@ public final class TestOldExcelExtractor extends POITestCase { // More complicated strings assertContains(text, "$100,000 or more"); assertContains(text, "S corporation returns, Form 1120S [10,15]"); - // TODO Get these quotes working correctly -// assertContains(text, "individual income tax return \u201Cshort forms.\u201D"); + assertContains(text, "individual income tax return \u201Cshort forms.\u201D"); // Formula based strings // TODO Find some then test