diff options
| author | Michael Williamson <mike@zwobble.org> | 2020-09-09 11:28:05 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2020-09-09 11:28:05 +0100 |
| commit | 999fbc8dc29b87a0f9c4497ec680915ac7ecae26 (patch) | |
| tree | 83adfcd13d5565bfa660d0f288591fcaca673139 /src/main/java/org/zwobble | |
| parent | ad794b686b4bdb06151f7e112c7ef7dcfebdd2fa (diff) | |
Handle underline elements where w:val is "none"
Diffstat (limited to 'src/main/java/org/zwobble')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java | 6 |
1 files changed, 5 insertions, 1 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 d5f594f..af6b70f 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java @@ -205,7 +205,11 @@ class StatefulBodyXmlReader { } private boolean isUnderline(XmlElementLike properties) { - return readBooleanElement(properties, "w:u"); + return properties.findChild("w:u") + .map(child -> child.getAttributeOrNone("w:val") + .map(value -> !value.equals("false") && !value.equals("0") && !value.equals("none")) + .orElse(true)) + .orElse(false); } private boolean isStrikethrough(XmlElementLike properties) { |
