From 9fd8c18948dda3559f01073996804a5ab66b34e1 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 15 Oct 2015 12:56:29 +0100
Subject: coverity#1326237 Explicit null dereferenced

Change-Id: Ic3ab796da48e28efaf1628f28b8632dd00c041b2
---
 .../openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xmerge')

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
+}
-- 
cgit