summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-02-04 11:28:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-04 15:47:12 +0000
commit1359b5635c4531495d2ed82b1385de99a3c1a864 (patch)
tree189a3aabb20ef5682cc378629b43972d60b7192e /xmerge
parent4ed467ccc8f69c056a380f9b07ad8871e11f7d37 (diff)
coverity#1326425 Dereference null return value
Change-Id: I3fda64e652310463e5a634341713562830babb87
Diffstat (limited to 'xmerge')
-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 4c573a7b6ef4..501059f9a979 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
@@ -498,7 +498,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants,
SxcConstants.COLUMN_STYLE_FAMILY, null,
ColumnStyle.class);
- columnWidth = cStyle.getColWidth();
+ columnWidth = cStyle != null ? cStyle.getColWidth() : 0;
col.setSize(columnWidth);
Debug.log(Debug.TRACE, "traverseColumn() Column Width : " + columnWidth);