summaryrefslogtreecommitdiff
path: root/xmerge/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-02-04 11:25:57 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-04 15:47:12 +0000
commit28fc15b3d35561bd2ed55526691c92689d9227dc (patch)
treeb5b2a13f3b2a2b837357c50df6d2af2313cb1271 /xmerge/source
parent84db01965ef701c829d54d278663f7cf8d670cba (diff)
coverity#1326427 Dereference null return value
Change-Id: Id4ff5ab007e9ddbc28018570fe38abe9e5acb54b
Diffstat (limited to 'xmerge/source')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java2
1 files changed, 1 insertions, 1 deletions
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,