summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorjan iversen <jani@documentfoundation.org>2016-01-25 11:28:50 +0100
committerjan iversen <jani@documentfoundation.org>2016-01-29 10:04:39 +0000
commit3c28a0e3864edc2812a02dec2f80f09d6cf2bc73 (patch)
tree0dde3fa722db1484ef290147cf3a429211db3b9f /xmerge
parentb9daeb01a26d21f1801d2b4c861eb3d59c886949 (diff)
null pointer dereference, made test Change-Id: I2bd820a2eb04499ab3b518d5b5e5ccccf3ffe531 Reviewed-on: https://gerrit.libreoffice.org/21771 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
index ed7012d76cf2..a7b54636cc86 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
@@ -88,8 +88,8 @@ public final class DocumentDeserializerImpl
while (enumerate.hasNext()) {
docOut = (DOMDocument) enumerate.next();
}
- domDoc = docOut.getContentDOM();
try {
+ domDoc = docOut.getContentDOM();
baos = transform(domDoc);
sxwDoc.initContentDOM();
DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
@@ -184,4 +184,4 @@ public final class DocumentDeserializerImpl
Debug.log(Debug.TRACE, str);
}
-} \ No newline at end of file
+}