From: Javen O'Neal <onealj@apache.org>
Date: Wed, 25 Nov 2015 11:48:17 +0000 (+0000)
Subject: bug 58651: replace for-looped sheet.getMergedRegion(index) with sheet.getMergedRegions()
X-Git-Tag: REL_3_14_BETA1~74
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3f3e519628dd5e3fa915f252f283fef58b19443e;p=poi.git

bug 58651: replace for-looped sheet.getMergedRegion(index) with sheet.getMergedRegions()

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1716362 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 31d470043d..9a258d35bf 100644
--- a/src/java/org/apache/poi/ss/util/SheetUtil.java
+++ b/src/java/org/apache/poi/ss/util/SheetUtil.java
@@ -104,8 +104,7 @@ public class SheetUtil {
         int column = cell.getColumnIndex();
 
         int colspan = 1;
-        for (int i = 0 ; i < sheet.getNumMergedRegions(); i++) {
-            CellRangeAddress region = sheet.getMergedRegion(i);
+        for (CellRangeAddress region : sheet.getMergedRegions()) {
             if (containsCell(region, row.getRowNum(), column)) {
                 if (!useMergedCells) {
                     // If we're not using merged cells, skip this one and move on to the next.
@@ -335,8 +334,7 @@ public class SheetUtil {
             }
         }
         
-        for (int mr=0; mr<sheet.getNumMergedRegions(); mr++) {
-            CellRangeAddress mergedRegion = sheet.getMergedRegion(mr);
+        for (CellRangeAddress mergedRegion : sheet.getMergedRegions()) {
             if (mergedRegion.isInRange(rowIx, colIx)) {
                 // The cell wanted is in this merged range
                 // Return the primary (top-left) cell for the range
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
index a44a2fdc76..f19023f047 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
+++ b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
@@ -46,10 +46,8 @@ public class ExcelToHtmlUtils extends AbstractExcelUtils
     public static CellRangeAddress[][] buildMergedRangesMap( HSSFSheet sheet )
     {
         CellRangeAddress[][] mergedRanges = new CellRangeAddress[1][];
-        for ( int m = 0; m < sheet.getNumMergedRegions(); m++ )
+        for ( final CellRangeAddress cellRangeAddress : sheet.getMergedRegions() )
         {
-            final CellRangeAddress cellRangeAddress = sheet.getMergedRegion( m );
-
             final int requiredHeight = cellRangeAddress.getLastRow() + 1;
             if ( mergedRanges.length < requiredHeight )
             {