diff options
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/DocumentConverter.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/docx/DocumentReader.java | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/org/zwobble/mammoth/DocumentConverter.java b/src/main/java/org/zwobble/mammoth/DocumentConverter.java index 5cf8c9d..154b878 100644 --- a/src/main/java/org/zwobble/mammoth/DocumentConverter.java +++ b/src/main/java/org/zwobble/mammoth/DocumentConverter.java @@ -217,8 +217,8 @@ public class DocumentConverter { return list(Html.selfClosingElement("img", attributes.build())); } catch (IOException exception) { - // TODO: return a result with a warning - throw new RuntimeException(exception); + warnings.add(warning(exception.getMessage())); + return MammothLists.<HtmlNode>list(); } }) .orElse(list()); diff --git a/src/main/java/org/zwobble/mammoth/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/docx/DocumentReader.java index 8fe0919..284dd89 100644 --- a/src/main/java/org/zwobble/mammoth/docx/DocumentReader.java +++ b/src/main/java/org/zwobble/mammoth/docx/DocumentReader.java @@ -22,7 +22,13 @@ public class DocumentReader { Styles styles = readStyles(zipFile); Numbering numbering = readNumbering(zipFile); ContentTypes contentTypes = readContentTypes(zipFile); - FileReader fileReader = uri -> path.get().toUri().resolve(uri).toURL().openStream(); + FileReader fileReader = uri -> { + try { + return path.get().toUri().resolve(uri).toURL().openStream(); + } catch (IOException exception) { + throw new IOException("could not open external image '" + uri + "': " + exception.getMessage()); + } + }; BodyReaders bodyReaders = name -> { Relationships relationships = readRelationships(zipFile, name); return new BodyXmlReader(styles, numbering, relationships, contentTypes, zipFile, fileReader); |