From d6d47e0bcab97cab0388f3c3debc8f572ff87f45 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Wed, 16 Mar 2016 22:10:27 +0000 Subject: [PATCH] findbugs fixes git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1735319 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/poifs/storage/BATBlock.java | 5 +++-- src/java/org/apache/poi/sl/draw/DrawTextParagraph.java | 4 ++-- src/java/org/apache/poi/util/HexDump.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/java/org/apache/poi/poifs/storage/BATBlock.java b/src/java/org/apache/poi/poifs/storage/BATBlock.java index b04591dde..2aef116d6 100644 --- a/src/java/org/apache/poi/poifs/storage/BATBlock.java +++ b/src/java/org/apache/poi/poifs/storage/BATBlock.java @@ -242,12 +242,13 @@ public final class BATBlock extends BigBlock { */ public static long calculateMaximumSize(final POIFSBigBlockSize bigBlockSize, final int numBATs) { - long size = 1; // Header isn't FAT addressed + // Header isn't FAT addressed + long size = 1; // The header has up to 109 BATs, and extra ones are referenced // from XBATs // However, all BATs can contain 128/1024 blocks - size += (numBATs * bigBlockSize.getBATEntriesPerBlock()); + size += (((long)numBATs) * bigBlockSize.getBATEntriesPerBlock()); // So far we've been in sector counts, turn into bytes return size * bigBlockSize.getBigBlockSize(); diff --git a/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java b/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java index 7b28bde58..1ffa3cb94 100644 --- a/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java +++ b/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java @@ -122,11 +122,11 @@ public class DrawTextParagraph implements Drawable { Double leftMargin = paragraph.getLeftMargin(); if (leftMargin == null) { // if the marL attribute is omitted, then a value of 347663 is implied - leftMargin = Units.toPoints(347663*indentLevel); + leftMargin = Units.toPoints(347663L*indentLevel); } Double indent = paragraph.getIndent(); if (indent == null) { - indent = Units.toPoints(347663*indentLevel); + indent = Units.toPoints(347663L*indentLevel); } if (isHSLF()) { // special handling for HSLF diff --git a/src/java/org/apache/poi/util/HexDump.java b/src/java/org/apache/poi/util/HexDump.java index e72a80ede..d134b540f 100644 --- a/src/java/org/apache/poi/util/HexDump.java +++ b/src/java/org/apache/poi/util/HexDump.java @@ -283,7 +283,7 @@ public class HexDump { * @return The result right padded with 0 */ public static String toHex(int value) { - return xpad(value & 0xFFFFFFFF, 8, ""); + return xpad(value & 0xFFFFFFFFL, 8, ""); } /**