From: Javen O'Neal <onealj@apache.org>
Date: Sat, 29 Apr 2017 18:56:09 +0000 (+0000)
Subject: bug 61034: break out of for-loop when both <sheet name="", id=""/> are found
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f5389965a288adba29dbdc4f351fc90128916bf7;p=poi.git

bug 61034: break out of for-loop when both <sheet name="", id=""/> are found

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

diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
index d82c70d3d5..dddd3bac13 100644
--- a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
+++ b/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
@@ -426,6 +426,8 @@ public class XSSFReader {
 
         private final List<XSSFSheetRef> sheetRefs = new LinkedList();
 
+        // read <sheet name="Sheet6" sheetId="4" r:id="rId6"/>
+        // and add XSSFSheetRef(id="rId6", name="Sheet6") to sheetRefs
         @Override
         public void startElement(String uri, String localName, String qName, Attributes attrs) throws SAXException {
             if (localName.equalsIgnoreCase(SHEET)) {
@@ -438,9 +440,10 @@ public class XSSFReader {
                     } else if (attrName.equalsIgnoreCase(ID)) {
                         id = attrs.getValue(i);
                     }
-                }
-                if (name != null && id != null) {
-                    sheetRefs.add(new XSSFSheetRef(id, name));
+                    if (name != null && id != null) {
+                        sheetRefs.add(new XSSFSheetRef(id, name));
+                        break;
+                    }
                 }
             }
         }