diff options
| author | Andreas Beeker <kiwiwings@apache.org> | 2015-09-29 08:31:15 +0000 |
|---|---|---|
| committer | Andreas Beeker <kiwiwings@apache.org> | 2015-09-29 08:31:15 +0000 |
| commit | aacf48d5aaaee4bf2b154b63a8a6f36ebbf2aa19 (patch) | |
| tree | 78b4f0998e7019fdfcfc738a5ecd735353c2d6c0 /src/java/org/apache/poi | |
| parent | 3109f16a7ff17da81917a2830c8789109e9c39bf (diff) | |
| download | poi-aacf48d5aaaee4bf2b154b63a8a6f36ebbf2aa19.tar.gz poi-aacf48d5aaaee4bf2b154b63a8a6f36ebbf2aa19.zip | |
sonar fixes
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1705814 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/poi')
| -rw-r--r-- | src/java/org/apache/poi/hpsf/Section.java | 8 | ||||
| -rw-r--r-- | src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java | 17 |
2 files changed, 9 insertions, 16 deletions
diff --git a/src/java/org/apache/poi/hpsf/Section.java b/src/java/org/apache/poi/hpsf/Section.java index 3c8e5b7ce8..eeed53e4c3 100644 --- a/src/java/org/apache/poi/hpsf/Section.java +++ b/src/java/org/apache/poi/hpsf/Section.java @@ -447,12 +447,12 @@ public class Section public String getPIDString(final long pid) { String s = null; - if (dictionary != null) + if (dictionary != null) { s = dictionary.get(Long.valueOf(pid)); - if (s == null) + } + if (s == null) { s = SectionIDMap.getPIDString(getFormatID().getBytes(), pid); - if (s == null) - s = SectionIDMap.UNDEFINED; + } return s; } diff --git a/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java b/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java index 42571f1c2b..b270182a0f 100644 --- a/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java +++ b/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java @@ -358,18 +358,11 @@ public class ExcelExtractor extends POIOLE2TextExtractor implements org.apache.p } break; case HSSFCell.CELL_TYPE_NUMERIC: - HSSFCellStyle style = cell.getCellStyle(); - if(style == null) { - text.append( cell.getNumericCellValue() ); - } else { - text.append( - _formatter.formatRawCellContents( - cell.getNumericCellValue(), - style.getDataFormat(), - style.getDataFormatString() - ) - ); - } + HSSFCellStyle style = cell.getCellStyle(); + double nVal = cell.getNumericCellValue(); + short df = style.getDataFormat(); + String dfs = style.getDataFormatString(); + text.append(_formatter.formatRawCellContents(nVal, df, dfs)); break; case HSSFCell.CELL_TYPE_BOOLEAN: text.append(cell.getBooleanCellValue()); |