diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-10-15 12:56:29 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-15 14:26:06 +0100 |
commit | 9fd8c18948dda3559f01073996804a5ab66b34e1 (patch) | |
tree | 548d26d7da93e20ad0025f44d5afdea529f98753 /xmerge/source | |
parent | 52e8a8062852c10cb8f37402a97f5475db78b472 (diff) |
coverity#1326237 Explicit null dereferenced
Change-Id: Ic3ab796da48e28efaf1628f28b8632dd00c041b2
Diffstat (limited to 'xmerge/source')
-rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java index 9d6ddbc6ee1a..bfd7fb3e8476 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java @@ -494,7 +494,7 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants, int newCol = decoder.getColNumber(); // Check to see if some columns were skipped - if (newCol != col) { + if (newCol != col && rowElement != null) { // How many columns have we skipped? int numColsSkipped = newCol - col; @@ -738,4 +738,4 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants, } } } -}
\ No newline at end of file +} |