Read checked for complex field checkboxes

mwilliamson · Nov 30, 2024 · 4289436 · 4289436
1 parent 9272cde
commit 4289436
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
@@ -362,7 +362,9 @@ private ComplexField parseInstrText(String instrText, XmlElementLike fldChar) {
                 .findChildOrEmpty("w:ffData")
                 .findChildOrEmpty("w:checkBox");
 
-            boolean checked = readBooleanElement(checkboxElement, "w:default");
+            boolean checked = checkboxElement.hasChild("w:checked")
+                ? readBooleanElement(checkboxElement, "w:checked")
+                : readBooleanElement(checkboxElement, "w:default");
 
             return ComplexField.checkbox(checked);
         }

diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -682,6 +682,46 @@ public void complexFieldCheckboxWithDefault1AndWithoutCheckedIsChecked() {
             )));
         }
 
+        @Test
+        public void complexFieldCheckboxWithDefault1AndChecked0IsUnchecked() {
+            XmlElement element = complexFieldCheckboxParagraph(list(
+                element("w:checkBox", list(
+                    element("w:default", map("w:val", "1")),
+                    element("w:checked", map("w:val", "0"))
+                ))
+            ));
+
+            DocumentElement paragraph = readSuccess(bodyReader(), element);
+
+            assertThat(paragraph, isParagraph(hasChildren(
+                isEmptyRun(),
+                isEmptyRun(),
+                isRun(hasChildren(
+                    isCheckbox(false)
+                ))
+            )));
+        }
+
+        @Test
+        public void complexFieldCheckboxWithDefault0AndChecked1IsUnchecked() {
+            XmlElement element = complexFieldCheckboxParagraph(list(
+                element("w:checkBox", list(
+                    element("w:default", map("w:val", "0")),
+                    element("w:checked", map("w:val", "1"))
+                ))
+            ));
+
+            DocumentElement paragraph = readSuccess(bodyReader(), element);
+
+            assertThat(paragraph, isParagraph(hasChildren(
+                isEmptyRun(),
+                isEmptyRun(),
+                isRun(hasChildren(
+                    isCheckbox(true)
+                ))
+            )));
+        }
+
         private XmlElement complexFieldCheckboxParagraph(List<XmlNode> ffDataChildren) {
             return element("w:p", list(
                 element("w:r", list(