moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Add more non-test classes in OOXMLLite and add another font-metric that appears

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1805516 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2017-08-19 16:31:28 +00:00
parent 5e5adc70e5
commit b233345510
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ooxml/java/org/apache/poi/util/OOXMLLite.java
View File

@ -119,7 +119,19 @@ public final class OOXMLLite {
"TestFormulaEvaluatorOnXSSF\\$SS", "TestFormulaEvaluatorOnXSSF\\$SS",
"TestMultiSheetFormulaEvaluatorOnXSSF\\$Result", "TestMultiSheetFormulaEvaluatorOnXSSF\\$Result",
"TestMultiSheetFormulaEvaluatorOnXSSF\\$SS", "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); System.out.println("Collecting unit tests from " + _testDir);
collectTests(_testDir, _testDir, lst, ".+.class$", ".+(" + exclude + ").class"); collectTests(_testDir, _testDir, lst, ".+.class$", ".+(" + exclude + ").class");

11
src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
View File

@ -27,7 +27,6 @@ import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -225,7 +224,7 @@ public class XSSFReader {
*/ */
SheetIterator(PackagePart wb) throws IOException { SheetIterator(PackagePart wb) throws IOException {
/** /*
* The order of sheets is defined by the order of CTSheet elements in workbook.xml * The order of sheets is defined by the order of CTSheet elements in workbook.xml
*/ */
try { try {
@ -251,7 +250,7 @@ public class XSSFReader {
Iterator<XSSFSheetRef> createSheetIteratorFromWB(PackagePart wb) throws IOException { Iterator<XSSFSheetRef> createSheetIteratorFromWB(PackagePart wb) throws IOException {
XMLSheetRefReader xmlSheetRefReader = new XMLSheetRefReader(); XMLSheetRefReader xmlSheetRefReader = new XMLSheetRefReader();
XMLReader xmlReader = null; XMLReader xmlReader;
try { try {
xmlReader = SAXHelper.newXMLReader(); xmlReader = SAXHelper.newXMLReader();
} catch (ParserConfigurationException e) { } catch (ParserConfigurationException e) {
@ -371,9 +370,7 @@ public class XSSFReader {
continue; continue;
} }
XSSFDrawing drawing = new XSSFDrawing(drawingsPart); XSSFDrawing drawing = new XSSFDrawing(drawingsPart);
for (XSSFShape shape : drawing.getShapes()){ shapes.addAll(drawing.getShapes());
shapes.add(shape);
}
} }
} catch (XmlException e){ } catch (XmlException e){
return null; return null;
@ -424,7 +421,7 @@ public class XSSFReader {
private static final String ID = "id"; private static final String ID = "id";
private static final String NAME = "name"; 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"/> // read <sheet name="Sheet6" sheetId="4" r:id="rId6"/>
// and add XSSFSheetRef(id="rId6", name="Sheet6") to sheetRefs // and add XSSFSheetRef(id="rId6", name="Sheet6") to sheetRefs

9
src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
View File

@ -74,12 +74,13 @@ public class TestFonts {
// currently linux and mac return quite different values // currently linux and mac return quite different values
private static final int[] expected_sizes = { private static final int[] expected_sizes = {
304, // windows 10, 1080p, MS Office 2016, system text scaling 100% instead of default 125% 304, // windows 10, 1080p, MS Office 2016, system text scaling 100% instead of default 125%
306, //Windows 10, 15.6" 3840x2160 306, // Windows 10, 15.6" 3840x2160
311, 312, 313, 318, 311, 312, 313, 318,
348, //Windows 10, 15.6" 3840x2160 348, // Windows 10, 15.6" 3840x2160
362, // Windows 10, 13.3" 1080p high-dpi 362, // Windows 10, 13.3" 1080p high-dpi
377, 398, 399, //Mac 372, // Ubuntu Xenial, 15", 1680x1050
406 // Ubuntu Trusty, 15", 1680x1050 377, 398, 399, // Mac
406 // Ubuntu Xenial, 15", 1680x1050
}; };
@BeforeClass @BeforeClass