From 999fbc8dc29b87a0f9c4497ec680915ac7ecae26 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 9 Sep 2020 11:28:05 +0100 Subject: Handle underline elements where w:val is "none" --- .../org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java') 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) { -- cgit v1.2.3