supporting change for bug 56454: SheetUtil.containsCell and CellRangeAddress.isInRang...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1718221 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ss/util/SheetUtil.java b/src/java/org/apache/poi/ss/util/SheetUtil.java
index 2103fdf2f70b80f5db22fd18a78b70c46eabd119..d4fb3dbc3a3db7ee41ab03a19d42cac5b01d90de 100644 (file)
--- a/src/java/org/apache/poi/ss/util/SheetUtil.java
+++ b/src/java/org/apache/poi/ss/util/SheetUtil.java
@@ -318,14 +318,16 @@ public class SheetUtil {
         if (font.getUnderline() == Font.U_SINGLE ) str.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON, startIdx, endIdx);
     }
 
+    /**
+     * Check if the cell is in the specified cell range
+     *
+     * @param cr    the cell range to check in
+     * @param rowIx the row to check
+     * @param colIx the column to check
+     * @return true if the range contains the cell [rowIx, colIx]
+     */
     public static boolean containsCell(CellRangeAddress cr, int rowIx, int colIx) {
-        //FIXME: isn't this the same as cr.isInRange(rowInd, colInd) ?
-        if (cr.getFirstRow() <= rowIx && cr.getLastRow() >= rowIx
-                && cr.getFirstColumn() <= colIx && cr.getLastColumn() >= colIx)
-        {
-            return true;
-        }
-        return false;
+        return cr.isInRange(rowIx,  colIx);
     }
 
     /**