Bug 63073: Adjust returned index of merged regions and verify all calls in tests

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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 8f3e411644..955fcdec7c 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -392,7 +392,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet  {
      *
      * @param region to merge
      * @param validate whether to validate merged region
-     * @return index of this region
+     * @return 0-based index of this region
      * @throws IllegalArgumentException if region contains fewer than 2 cells (this check is inexpensive and is performed regardless of <tt>validate</tt>)
      * @throws IllegalStateException if region intersects with a multi-cell array formula
      * @throws IllegalStateException if region intersects with an existing region on this sheet
@@ -409,14 +409,14 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet  {
             validateArrayFormulas(region);
 
             // Throw IllegalStateException if the argument CellRangeAddress intersects with
-            // a merged region already in this sheet 
+            // a merged region already in this sheet
             validateMergedRegions(region);
         }
 
         CTMergeCells ctMergeCells = worksheet.isSetMergeCells() ? worksheet.getMergeCells() : worksheet.addNewMergeCells();
         CTMergeCell ctMergeCell = ctMergeCells.addNewMergeCell();
         ctMergeCell.setRef(region.formatAsString());
-        return ctMergeCells.sizeOfMergeCellArray();
+        return ctMergeCells.sizeOfMergeCellArray()-1;
     }
 
     /**