From: Dominik Stadler <centic@apache.org>
Date: Sun, 31 Aug 2014 19:53:53 +0000 (+0000)
Subject: Bug 55280: Don't repeatedely fetch the size of the CTMergeCells object as this is... 
X-Git-Tag: REL_3_11_BETA3~86
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=84999045375775ac0411b022989bca090d3c6a1a;p=poi.git

Bug 55280: Don't repeatedely fetch the size of the CTMergeCells object as this is a costly operation with XMLBeans

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

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 29c391ee6d..543263f7af 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -1579,8 +1579,9 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     public void removeMergedRegion(int index) {
         CTMergeCells ctMergeCells = worksheet.getMergeCells();
 
-        CTMergeCell[] mergeCellsArray = new CTMergeCell[ctMergeCells.sizeOfMergeCellArray() - 1];
-        for (int i = 0 ; i < ctMergeCells.sizeOfMergeCellArray() ; i++) {
+        int size = ctMergeCells.sizeOfMergeCellArray();
+        CTMergeCell[] mergeCellsArray = new CTMergeCell[size - 1];
+        for (int i = 0 ; i < size ; i++) {
             if (i < index) {
                 mergeCellsArray[i] = ctMergeCells.getMergeCellArray(i);
             }