Test reading of table rows when non-rows are present

1 files changed, 11 insertions, 0 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
index 436d5d9..649a47b 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
@@ -500,6 +500,7 @@ class StatefulBodyXmlReader {
     private ReadResult calculateRowspans(List<DocumentElement> rows) {
         Optional<String> error = checkTableRows(rows);
         if (error.isPresent()) {
+            rows = removeUnmergedTableCells(rows);
             return ReadResult.withWarning(rows, error.get());
         }
 
@@ -561,6 +562,16 @@ class StatefulBodyXmlReader {
         return Optional.empty();
     }
 
+    private List<DocumentElement> removeUnmergedTableCells(List<DocumentElement> rows) {
+        return Lists.eagerMap(
+            rows,
+            transformElementsOfType(
+                UnmergedTableCell.class,
+                cell -> new TableCell(1, cell.colspan, cell.children)
+            )
+        );
+    }
+
     private ReadResult readTableRow(XmlElement element) {
         XmlElementLike properties = element.findChildOrEmpty("w:trPr");