* @param cell cell buffer to update
*/
public static void parse(byte[] data, int offset, int currentRow, XSSFBCellHeader cell) {
- long colNum = LittleEndian.getUInt(data, offset); offset += LittleEndian.INT_SIZE;
+ int colNum = XSSFBUtils.castToInt(LittleEndian.getUInt(data, offset)); offset += LittleEndian.INT_SIZE;
int styleIdx = XSSFBUtils.get24BitInt(data, offset); offset += 3;
//TODO: range checking
boolean showPhonetic = false;//TODO: fill this out
- cell.reset(currentRow, (int)colNum, styleIdx, showPhonetic);
+ cell.reset(currentRow, colNum, styleIdx, showPhonetic);
}
private int rowNum;
switch(type) {
case BrtRowHdr:
- long rw = LittleEndian.getUInt(data, 0);
- if (rw > 0x00100000L) {//could make sure this is larger than currentRow, according to spec?
+ int rw = XSSFBUtils.castToInt(LittleEndian.getUInt(data, 0));
+ if (rw > 0x00100000) {//could make sure this is larger than currentRow, according to spec?
throw new XSSFBParseException("Row number beyond allowable range: "+rw);
}
- currentRow = (int)rw;
+ currentRow = rw;
checkMissedComments(currentRow);
startRow(currentRow);
break;
beforeCellValue(data);
//xNum
double val = LittleEndian.getDouble(data, XSSFBCellHeader.length);
- String formatString = styles.getNumberFormatString(cellBuffer.getStyleIdx());
- String formattedVal = dataFormatter.formatRawCellContents(val, cellBuffer.getStyleIdx(), formatString);
- handleCellValue(formattedVal);
+ handleCellValue(formatVal(val, cellBuffer.getStyleIdx()));
}
private void handleCellSt(byte[] data) {
beforeCellValue(data);
//xNum
double val = LittleEndian.getDouble(data, XSSFBCellHeader.length);
- String formatString = styles.getNumberFormatString(cellBuffer.getStyleIdx());
- String formattedVal = dataFormatter.formatRawCellContents(val, cellBuffer.getStyleIdx(), formatString);
- handleCellValue(formattedVal);
+ handleCellValue(formatVal(val, cellBuffer.getStyleIdx()));
}
private void handleCellRk(byte[] data) {
beforeCellValue(data);
double val = rkNumber(data, XSSFBCellHeader.length);
- String formatString = styles.getNumberFormatString(cellBuffer.getStyleIdx());
- short styleIndex = styles.getNumberFormatIndex(cellBuffer.getStyleIdx());
- String formattedVal = dataFormatter.formatRawCellContents(val, styleIndex, formatString);
- handleCellValue(formattedVal);
+ handleCellValue(formatVal(val, cellBuffer.getStyleIdx()));
+ }
+
+ private String formatVal(double val, int styleIdx) {
+ String formatString = styles.getNumberFormatString(styleIdx);
+ short styleIndex = styles.getNumberFormatIndex(styleIdx);
+ return dataFormatter.formatRawCellContents(val, styleIndex, formatString);
}
private void handleBrtCellIsst(byte[] data) {
beforeCellValue(data);
- long idx = LittleEndian.getUInt(data, XSSFBCellHeader.length);
- //check for out of range, buffer overflow
-
- XSSFRichTextString rtss = new XSSFRichTextString(stringsTable.getEntryAt((int)idx));
+ int idx = XSSFBUtils.castToInt(LittleEndian.getUInt(data, XSSFBCellHeader.length));
+ XSSFRichTextString rtss = new XSSFRichTextString(stringsTable.getEntryAt(idx));
handleCellValue(rtss.getString());
}