Handle complex field checkboxes without separate field char

1 files changed, 13 insertions, 6 deletions

diff --git a/lib/docx/body-reader.js b/lib/docx/body-reader.js
index 5a27d2d..3e97d3e 100644
--- a/lib/docx/body-reader.js
+++ b/lib/docx/body-reader.js
@@ -165,6 +165,9 @@ function BodyReader(options) {
             currentInstrText = [];
         } else if (type === "end") {
             var complexFieldEnd = complexFieldStack.pop();
+            if (complexFieldEnd.type === "begin") {
+                complexFieldEnd = parseCurrentInstrText(complexFieldEnd);
+            }
             if (complexFieldEnd.type === "checkbox") {
                 return elementResult(documents.checkbox({
                     checked: complexFieldEnd.checked
@@ -172,12 +175,7 @@ function BodyReader(options) {
             }
         } else if (type === "separate") {
             var complexFieldSeparate = complexFieldStack.pop();
-            var complexField = parseInstrText(
-                currentInstrText.join(''),
-                complexFieldSeparate.type === "begin"
-                    ? complexFieldSeparate.fldChar
-                    : xml.emptyElement
-            );
+            var complexField = parseCurrentInstrText(complexFieldSeparate);
             complexFieldStack.push(complexField);
         }
         return emptyResult();
@@ -190,6 +188,15 @@ function BodyReader(options) {
         return topHyperlink ? topHyperlink.options : null;
     }
 
+    function parseCurrentInstrText(complexField) {
+        return parseInstrText(
+            currentInstrText.join(''),
+            complexField.type === "begin"
+                ? complexField.fldChar
+                : xml.emptyElement
+        );
+    }
+
     function parseInstrText(instrText, fldChar) {
         var externalLinkResult = /\s*HYPERLINK "(.*)"/.exec(instrText);
         if (externalLinkResult) {