From b65bc063d98c2ddb1dc4cc9b4dbcdc1aef23d5aa Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 3 Aug 2025 08:05:02 +0100 Subject: Ignore style definitions using a style ID that has already been used --- src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java') diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java index 656b0dd..31d55b7 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java @@ -9,8 +9,7 @@ import java.util.Map; import java.util.Optional; import static org.zwobble.mammoth.internal.util.Iterables.lazyFilter; -import static org.zwobble.mammoth.internal.util.Maps.entry; -import static org.zwobble.mammoth.internal.util.Maps.toMap; +import static org.zwobble.mammoth.internal.util.Maps.*; public class StylesXml { public static Styles readStylesXmlElement(XmlElement element) { @@ -24,7 +23,7 @@ public class StylesXml { } private static Map readStyles(XmlElementList styleElements, String styleType) { - return toMap( + return toMapPreferFirst( styleElementsOfType(styleElements, styleType), StylesXml::readStyle ); @@ -37,7 +36,7 @@ public class StylesXml { } private static Map readNumberingStyles(XmlElementList styleElements) { - return toMap( + return toMapPreferFirst( styleElementsOfType(styleElements, "numbering"), StylesXml::readNumberingStyle ); -- cgit v1.2.3