diff options
Diffstat (limited to 'src/ooxml/java/org/apache/poi')
| -rw-r--r-- | src/ooxml/java/org/apache/poi/util/OOXMLLite.java | 14 | ||||
| -rw-r--r-- | src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java | 11 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/ooxml/java/org/apache/poi/util/OOXMLLite.java b/src/ooxml/java/org/apache/poi/util/OOXMLLite.java index 4eaa825e57..e6dc38ce78 100644 --- a/src/ooxml/java/org/apache/poi/util/OOXMLLite.java +++ b/src/ooxml/java/org/apache/poi/util/OOXMLLite.java @@ -119,7 +119,19 @@ public final class OOXMLLite { "TestFormulaEvaluatorOnXSSF\\$SS", "TestMultiSheetFormulaEvaluatorOnXSSF\\$Result", "TestMultiSheetFormulaEvaluatorOnXSSF\\$SS", - "TestXSSFBugs\\$\\d" + "TestXSSFBugs\\$\\d", + "AddImageBench", + "AddImageBench_jmhType_B\\d", + "AddImageBench_benchCreatePicture_jmhTest", + "TestEvilUnclosedBRFixingInputStream\\$EvilUnclosedBRFixingInputStream", + "TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource\\$TempFileRecordingSheetDataWriterWithDecorator", + "TestXSSFBReader\\$1", + "TestXSSFBReader\\$TestSheetHandler", + "TestFormulaEvaluatorOnXSSF\\$1", + "TestMultiSheetFormulaEvaluatorOnXSSF\\$1", + "TestZipPackagePropertiesMarshaller\\$1", + "SLCommonUtils", + "TestPPTX2PNG\\$1" ); System.out.println("Collecting unit tests from " + _testDir); collectTests(_testDir, _testDir, lst, ".+.class$", ".+(" + exclude + ").class"); 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 0bc6d3f5ac..1652b2a774 100644 --- a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java +++ b/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java @@ -27,7 +27,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Set; @@ -225,7 +224,7 @@ public class XSSFReader { */ SheetIterator(PackagePart wb) throws IOException { - /** + /* * The order of sheets is defined by the order of CTSheet elements in workbook.xml */ try { @@ -251,7 +250,7 @@ public class XSSFReader { Iterator<XSSFSheetRef> createSheetIteratorFromWB(PackagePart wb) throws IOException { XMLSheetRefReader xmlSheetRefReader = new XMLSheetRefReader(); - XMLReader xmlReader = null; + XMLReader xmlReader; try { xmlReader = SAXHelper.newXMLReader(); } catch (ParserConfigurationException e) { @@ -371,9 +370,7 @@ public class XSSFReader { continue; } XSSFDrawing drawing = new XSSFDrawing(drawingsPart); - for (XSSFShape shape : drawing.getShapes()){ - shapes.add(shape); - } + shapes.addAll(drawing.getShapes()); } } catch (XmlException e){ return null; @@ -424,7 +421,7 @@ public class XSSFReader { private static final String ID = "id"; private static final String NAME = "name"; - private final List<XSSFSheetRef> sheetRefs = new LinkedList(); + private final List<XSSFSheetRef> sheetRefs = new LinkedList<XSSFSheetRef>(); // read <sheet name="Sheet6" sheetId="4" r:id="rId6"/> // and add XSSFSheetRef(id="rId6", name="Sheet6") to sheetRefs |