XLSX open error with template created by Office 365 #128

cuba-platform · Apr 12, 2020 · 48f2591 · 48f2591
1 parent 0ba5eca
commit 48f2591
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -235,7 +235,7 @@ configure(core) {
  compile (group: 'com.openhtmltopdf', name: 'openhtmltopdf-pdfbox', version: '1.0.0') {
  exclude(group: 'junit', module: 'junit')
  }
- compile(group: "org.docx4j", name: "docx4j-JAXB-ReferenceImpl", version: "8.1.2") {
+ compile(group: "org.docx4j", name: "docx4j-JAXB-ReferenceImpl", version: "8.1.6") {
  exclude(group: 'junit', module: 'junit')
  exclude(group: 'log4j', module: 'log4j')
  exclude(group: 'org.slf4j', module: 'slf4j-log4j12')
@@ -248,7 +248,7 @@ configure(core) {
  exclude(group: 'org.slf4j', module: 'slf4j-log4j12')
  exclude(group: 'com.fasterxml.jackson.core')
  }
- compile(group: "org.docx4j", name: "docx4j-export-fo", version: "8.1.2") {
+ compile(group: "org.docx4j", name: "docx4j-export-fo", version: "8.1.6") {
  exclude(group: 'junit', module: 'junit')
  exclude(group: 'log4j', module: 'log4j')
  exclude(group: 'org.slf4j', module: 'slf4j-log4j12')

diff --git a/core/modules/core/src/com/haulmont/yarg/formatters/impl/XlsxFormatter.java b/core/modules/core/src/com/haulmont/yarg/formatters/impl/XlsxFormatter.java
@@ -33,11 +33,14 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.docx4j.XmlUtils;
-import org.docx4j.dml.chart.*;
+import org.docx4j.dml.chart.CTAxDataSource;
+import org.docx4j.dml.chart.CTChart;
+import org.docx4j.dml.chart.CTNumDataSource;
+import org.docx4j.dml.chart.CTPlotArea;
 import org.docx4j.dml.spreadsheetdrawing.CTTwoCellAnchor;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
-import org.docx4j.openpackaging.io.SaveToZipFile;
+import org.docx4j.openpackaging.io3.Save;
 import org.docx4j.openpackaging.packages.SpreadsheetMLPackage;
 import org.docx4j.openpackaging.parts.PartName;
 import org.docx4j.openpackaging.parts.SpreadsheetML.CalcChain;
@@ -47,7 +50,6 @@
 import org.slf4j.LoggerFactory;
 import org.xlsx4j.jaxb.Context;
 import org.xlsx4j.sml.*;
-import org.xlsx4j.sml.CTHeaderFooter;
 
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
@@ -1025,8 +1027,8 @@ protected void saveXlsxAsCsv(Document document, OutputStream outputStream) throw
  }
 
  protected void writeToOutputStream(SpreadsheetMLPackage mlPackage, OutputStream outputStream) throws Docx4JException {
- SaveToZipFile saver = new SaveToZipFile(mlPackage);
- saver.save(outputStream);
+ Save save = new Save(mlPackage);
+ save.save(outputStream);
  }
 
  protected void updateHeaderAndFooter() {