summaryrefslogtreecommitdiff
path: root/src/main/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/documents/Break.java4
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java15
2 files changed, 12 insertions, 7 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/documents/Break.java b/src/main/java/org/zwobble/mammoth/internal/documents/Break.java
index 9076d21..0764221 100644
--- a/src/main/java/org/zwobble/mammoth/internal/documents/Break.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Break.java
@@ -3,11 +3,13 @@ package org.zwobble.mammoth.internal.documents;
public class Break implements DocumentElement {
public enum Type {
LINE,
- PAGE
+ PAGE,
+ COLUMN
}
public static final Break LINE_BREAK = new Break(Type.LINE);
public static final Break PAGE_BREAK = new Break(Type.PAGE);
+ public static final Break COLUMN_BREAK = new Break(Type.COLUMN);
private final Type type;
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
index 89d739a..ec82930 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -242,12 +242,15 @@ public class BodyXmlReader {
private ReadResult readBreak(XmlElement element) {
String breakType = element.getAttributeOrNone("w:type").orElse("textWrapping");
- if (breakType.equals("textWrapping")) {
- return success(Break.LINE_BREAK);
- } else if (breakType.equals("page")) {
- return success(Break.PAGE_BREAK);
- } else {
- return ReadResult.emptyWithWarning("Unsupported break type: " + breakType);
+ switch (breakType) {
+ case "textWrapping":
+ return success(Break.LINE_BREAK);
+ case "page":
+ return success(Break.PAGE_BREAK);
+ case "column":
+ return success(Break.COLUMN_BREAK);
+ default:
+ return ReadResult.emptyWithWarning("Unsupported break type: " + breakType);
}
}