From 28fc15b3d35561bd2ed55526691c92689d9227dc Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 4 Feb 2016 11:25:57 +0000
Subject: coverity#1326427 Dereference null return value

Change-Id: Id4ff5ab007e9ddbc28018570fe38abe9e5acb54b
---
 .../org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xmerge')

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
index 5f025575e193..2604bf706c08 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
@@ -366,7 +366,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
                                         SxcConstants.ROW_STYLE_FAMILY, null,
                                         RowStyle.class);
 
-                int rowHeight = rStyle.getRowHeight();
+                int rowHeight = rStyle != null ? rStyle.getRowHeight() : 0;
 
                 Debug.log(Debug.TRACE, "traverseTableRow() Row Height : " + rowHeight);
                 ColumnRowInfo ri = new ColumnRowInfo(   rowHeight,
-- 
cgit