Author: kiwiwings
Date: Wed Mar 16 22:10:27 2016
New Revision: 1735319
URL: http://svn.apache.org/viewvc?rev=1735319&view=rev
Log:
findbugs fixes
Modified:
poi/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java
poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
poi/trunk/src/java/org/apache/poi/util/HexDump.java
Modified: poi/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java?rev=1735319&r1=1735318&r2=1735319&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/storage/BATBlock.java Wed Mar 16
22:10:27 2016
@@ -242,12 +242,13 @@ public final class BATBlock extends BigB
*/
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();
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java?rev=1735319&r1=1735318&r2=1735319&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java Wed Mar 16
22:10:27 2016
@@ -122,11 +122,11 @@ public class DrawTextParagraph implement
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
Modified: poi/trunk/src/java/org/apache/poi/util/HexDump.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/HexDump.java?rev=1735319&r1=1735318&r2=1735319&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/HexDump.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/HexDump.java Wed Mar 16 22:10:27 2016
@@ -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, "");
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
