]> source.dussan.org Git - poi.git/commit
Merged revision(s) 1569991, 1615720, 1615731, 1615780-1615781, 1615893, 1589759 from...
authorUwe Schindler <uschindler@apache.org>
Thu, 7 Aug 2014 15:25:17 +0000 (15:25 +0000)
committerUwe Schindler <uschindler@apache.org>
Thu, 7 Aug 2014 15:25:17 +0000 (15:25 +0000)
commit6d1b0291c52c70486c25a18db4de962472910d64
treec694d9b226abce6bd0146dbe3297357d87dab035
parent1c45f6ca9a4815cb992e86f84f31a21e9be00d1c
Merged revision(s) 1569991161572016157311615780-161578116158931589759 from poi/trunk:
Apply suggestions from Uwe Schindler for more secure xml defaults for #54764 and #56164, for xml parsers which support them
........
Add another test file for #54764, and a test that uses it
........
Change the default XMLBeans version used for running to be 2.6, leave 2.3 for compiling the schemas (for maximum compatibility)
........
Before parsing an OOXML document, reset the xmlbeans sax parser to avoid the risk of getting one in an error state (due to XMLBEANS-512). Should be a minimal extra overhead pending a proper fix. Allows us to finish enabling the unit tests for #54764
........
Correct xmlbeans 2.6 url

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/REL_3_10_BRANCH@1616509 13f79535-47bb-0310-9956-ffa450edef68
17 files changed:
.classpath
build.xml
maven/poi-ooxml-schemas.pom
src/ooxml/java/org/apache/poi/POIXMLDocument.java
src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
src/ooxml/java/org/apache/poi/util/SAXHelper.java [new file with mode: 0644]
src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
test-data/openxml4j/CorePropertiesHasEntities.ooxml [new file with mode: 0644]
test-data/openxml4j/PackageRelsHasEntities.ooxml [new file with mode: 0644]
test-data/spreadsheet/54764-2.xlsx [new file with mode: 0644]
test-data/spreadsheet/54764.xlsx [new file with mode: 0644]