protected static String getString(byte[] data, CodepageRecord codepage) {
int cp = CodePageUtil.CP_ISO_8859_1;
if (codepage != null) {
- cp = codepage.getCodepage();
+ cp = codepage.getCodepage() & 0xffff;
}
try {
return CodePageUtil.getStringFromCodePage(data, cp);
/** <p>Codepage for Windows 1252</p> */
public static final int CP_WINDOWS_1252 = 1252;
+ public static final int CP_WINDOWS_1252_BIFF23 = 32769;
/** <p>Codepage for Windows 1253</p> */
public static final int CP_WINDOWS_1253 = 1253;
/** <p>Codepage for Macintosh Roman (Java: MacRoman)</p> */
public static final int CP_MAC_ROMAN = 10000;
+ public static final int CP_MAC_ROMAN_BIFF23 = 32768;
/** <p>Codepage for Macintosh Japan (Java: unknown - use SJIS, cp942 or
* cp943)</p> */
else
return "windows-1251";
case CP_WINDOWS_1252:
+ case CP_WINDOWS_1252_BIFF23:
if (javaLangFormat)
return "Cp1252";
else
case CP_JOHAB:
return "johab";
case CP_MAC_ROMAN:
+ case CP_MAC_ROMAN_BIFF23:
return "MacRoman";
case CP_MAC_JAPAN:
return "SJIS";