moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Bug 60906 -- fix style index

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1788282 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tim Allison 2017-03-23 16:31:42 +00:00
parent 3953b18e2b
commit 925f4b85ad
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
View File

@ -192,7 +192,8 @@ public class XSSFBSheetHandler extends XSSFBParser {
beforeCellValue(data); beforeCellValue(data);
double val = rkNumber(data, XSSFBCellHeader.length); double val = rkNumber(data, XSSFBCellHeader.length);
String formatString = styles.getNumberFormatString(cellBuffer.getStyleIdx()); String formatString = styles.getNumberFormatString(cellBuffer.getStyleIdx());
String formattedVal = dataFormatter.formatRawCellContents(val, cellBuffer.getStyleIdx(), formatString); short styleIndex = styles.getNumberFormatIndex(cellBuffer.getStyleIdx());
String formattedVal = dataFormatter.formatRawCellContents(val, styleIndex, formatString);
handleCellValue(formattedVal); handleCellValue(formattedVal);
} }

11
src/ooxml/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java
View File

@ -48,11 +48,16 @@ public class XSSFBStylesTable extends XSSFBParser {
} }
String getNumberFormatString(int idx) { String getNumberFormatString(int idx) {
if (numberFormats.containsKey(styleIds.get((short)idx))) { short numberFormatIdx = getNumberFormatIndex(idx);
return numberFormats.get(styleIds.get((short)idx)); if (numberFormats.containsKey(numberFormatIdx)) {
return numberFormats.get(numberFormatIdx);
} }
return BuiltinFormats.getBuiltinFormat(styleIds.get((short)idx)); return BuiltinFormats.getBuiltinFormat(numberFormatIdx);
}
short getNumberFormatIndex(int idx) {
return styleIds.get(idx);
} }
@Override @Override