diff --git a/src/java/org/apache/poi/ss/util/AreaReference.java b/src/java/org/apache/poi/ss/util/AreaReference.java index 309ed51e51..7cf3b73c41 100644 --- a/src/java/org/apache/poi/ss/util/AreaReference.java +++ b/src/java/org/apache/poi/ss/util/AreaReference.java @@ -196,11 +196,10 @@ public class AreaReference { // These are represented as something like // C$1:C$65535 or D$1:F$0 // i.e. absolute from 1st row to 0th one - if(topLeft.getRow() == 0 && topLeft.isRowAbsolute() && - botRight.getRow() == version.getLastRowIndex() && botRight.isRowAbsolute()) { - return true; - } - return false; + return (topLeft.getRow() == 0 + && topLeft.isRowAbsolute() + && botRight.getRow() == version.getLastRowIndex() + && botRight.isRowAbsolute()); } public boolean isWholeColumnReference() { return isWholeColumnReference(_version, _firstCell, _lastCell); diff --git a/src/java/org/apache/poi/ss/util/SheetUtil.java b/src/java/org/apache/poi/ss/util/SheetUtil.java index 2087a9dc7e..ae4ef10576 100644 --- a/src/java/org/apache/poi/ss/util/SheetUtil.java +++ b/src/java/org/apache/poi/ss/util/SheetUtil.java @@ -318,11 +318,7 @@ public class SheetUtil { copyAttributes(font, str, 0, "1w".length()); TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext); - if(layout.getBounds().getWidth() > 0) { - return true; - } - - return false; + return (layout.getBounds().getWidth() > 0); } /**