aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java4
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
index beff7f7..9efd747 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
@@ -63,9 +63,9 @@ public class ReadResult {
this.warnings = warnings;
}
- public ReadResult map(Function<List<DocumentElement>, DocumentElement> function) {
+ public ReadResult map(Function<List<DocumentElement>, List<DocumentElement>> function) {
return new ReadResult(
- list(function.apply(elements)),
+ function.apply(elements),
extra,
warnings);
}
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 4962400..680bc92 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
@@ -564,7 +564,7 @@ class StatefulBodyXmlReader {
XmlElementLike properties = element.findChildOrEmpty("w:trPr");
boolean isHeader = properties.hasChild("w:tblHeader");
return readElements(element.getChildren())
- .map(children -> new TableRow(children, isHeader));
+ .map(children -> list(new TableRow(children, isHeader)));
}
private ReadResult readTableCell(XmlElement element) {
@@ -574,7 +574,7 @@ class StatefulBodyXmlReader {
.getAttributeOrNone("w:val");
int colspan = gridSpan.map(Integer::parseInt).orElse(1);
return readElements(element.getChildren())
- .map(children -> new UnmergedTableCell(readVmerge(properties), colspan, children));
+ .map(children -> list(new UnmergedTableCell(readVmerge(properties), colspan, children)));
}
private boolean readVmerge(XmlElementLike properties) {
@@ -612,11 +612,11 @@ class StatefulBodyXmlReader {
String href = anchor.map(fragment -> Uris.replaceFragment(targetHref, anchor.get()))
.orElse(targetHref);
return childrenResult.map(children ->
- Hyperlink.href(href, targetFrame, children)
+ list(Hyperlink.href(href, targetFrame, children))
);
} else if (anchor.isPresent()) {
return childrenResult.map(children ->
- Hyperlink.anchor(anchor.get(), targetFrame, children)
+ list(Hyperlink.anchor(anchor.get(), targetFrame, children))
);
} else {
return childrenResult;