From 5ec3c49c22c3448cd0583be74512129c221cd030 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 9 Sep 2025 09:17:22 +0100
Subject: Test reading of table rows when non-rows are present

---
 lib/docx/body-reader.js | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib')

diff --git a/lib/docx/body-reader.js b/lib/docx/body-reader.js
index 776cd5d..e6a70e2 100644
--- a/lib/docx/body-reader.js
+++ b/lib/docx/body-reader.js
@@ -521,6 +521,7 @@ function BodyReader(options) {
             return row.type !== documents.types.tableRow;
         });
         if (unexpectedNonRows) {
+            removeVMergeProperties(rows);
             return elementResultWithMessages(rows, [warning(
                 "unexpected non-row element in table, cell merging may be incorrect"
             )]);
@@ -563,6 +564,14 @@ function BodyReader(options) {
         return elementResult(rows);
     }
 
+    function removeVMergeProperties(rows) {
+        rows.forEach(function(row) {
+            row.children.forEach(function(cell) {
+                delete cell._vMerge;
+            });
+        });
+    }
+
     function readDrawingElement(element) {
         var blips = element
             .getElementsByTagName("a:graphic")
-- 
cgit v1.2.3