Author: onealj
Date: Sat Apr 29 18:56:09 2017
New Revision: 1793230
URL: http://svn.apache.org/viewvc?rev=1793230&view=rev
Log:
bug 61034: break out of for-loop when both <sheet name="", id=""/> are found
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java?rev=1793230&r1=1793229&r2=1793230&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
Sat Apr 29 18:56:09 2017
@@ -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;
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
