XLSX open error with template created by Office 365 #128

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

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -270,7 +270,7 @@ configure(core) {
  exclude(group: 'org.codehaus.castor', module: 'castor-xml')
  }
 
- testCompile(group: 'org.jmockit', name: 'jmockit', version: '1.15')
+ testCompile(group: 'org.jmockit', name: 'jmockit', version: '1.48')
  testCompile(group: 'junit', name: 'junit', version: '4.5')
  testCompile(group: 'com.h2database', name: 'h2', version: '1.4.196')
  testCompile(group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3')

diff --git a/core/modules/core/src/com/haulmont/yarg/formatters/impl/docx/AliasVisitor.java b/core/modules/core/src/com/haulmont/yarg/formatters/impl/docx/AliasVisitor.java
@@ -22,6 +22,7 @@
 import org.docx4j.XmlUtils;
 import org.docx4j.wml.ContentAccessor;
 import org.docx4j.wml.P;
+import org.docx4j.wml.SdtBlock;
 import org.docx4j.wml.Text;
 import org.jvnet.jaxb2_commons.ppp.Child;
 
@@ -60,7 +61,7 @@ public void walkJAXBElements(Object parent) {
  for (Object object : children) {
  object = XmlUtils.unwrap(object);
 
- if (object instanceof Child) {
+ if (object instanceof Child && !(parent instanceof SdtBlock)) {
  ((Child) object).setParent(parent);
  }
 

diff --git a/core/modules/core/src/com/haulmont/yarg/formatters/impl/docx/TableCollector.java b/core/modules/core/src/com/haulmont/yarg/formatters/impl/docx/TableCollector.java
@@ -20,10 +20,7 @@
 import com.haulmont.yarg.formatters.impl.DocxFormatterDelegate;
 import org.docx4j.TraversalUtil;
 import org.docx4j.XmlUtils;
-import org.docx4j.wml.P;
-import org.docx4j.wml.Tbl;
-import org.docx4j.wml.Text;
-import org.docx4j.wml.Tr;
+import org.docx4j.wml.*;
 import org.jvnet.jaxb2_commons.ppp.Child;
 
 import java.util.*;
@@ -112,7 +109,7 @@ public void walkJAXBElements(Object parent) {
  for (Object o : children) {
  o = XmlUtils.unwrap(o);
 
- if (o instanceof Child) {
+ if (o instanceof Child && !(parent instanceof SdtBlock)) {
  ((Child) o).setParent(parent);
  }