diff --git a/build.xml b/build.xml index 78c3f7b685..1312b9c73a 100644 --- a/build.xml +++ b/build.xml @@ -933,7 +933,7 @@ under the License. - + diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle index d5f83c78cb..502dc0c8fe 100644 --- a/poi-ooxml-full/build.gradle +++ b/poi-ooxml-full/build.gradle @@ -75,7 +75,7 @@ task copy_xsds(type: Copy) { from ('src/main/xmlschema/org/apache/poi/xdgf') from ('src/main/xmlschema/org/apache/poi/schemas') { include 'XAdES*.xsd', '*.xsdconfig', 'xmldsig*.xsd', 'ooxmlSchemas.xsdconfig', 'markup-compatibility.xsd', - 'vmlDrawing.xsd', 'word12.xsd', 'xlThreaded*.xsd', 'dml-drawing.xsd', 'drawing-chart2012.xsd', + 'vmlDrawing.xsd', 'word10.xsd', 'word12.xsd', 'xlThreaded*.xsd', 'dml-drawing.xsd', 'drawing-chart2012.xsd', 'chartEx.xsd' exclude '*.zip' } diff --git a/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/word10.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/word10.xsd new file mode 100644 index 0000000000..4ced5b5a97 --- /dev/null +++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/word10.xsd @@ -0,0 +1,562 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java index 6e070b1252..e848e383cd 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java +++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java @@ -68,6 +68,8 @@ public class POIXMLTypeLoader { map.put(MS_EXCEL_URN, "x"); map.put(MS_WORD_URN, "w10"); map.put(MS_VML_URN, "v"); + map.put("http://schemas.microsoft.com/office/word/2010/wordml", "w14"); + map.put("http://schemas.microsoft.com/office/word/2012/wordml", "w15"); map.put("http://schemas.microsoft.com/office/drawing/2012/chart", "c15"); DEFAULT_XML_OPTIONS.setSaveSuggestedPrefixes(Collections.unmodifiableMap(map)); }