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

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

(limited to 'xmerge/source')

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);
 
-- 
cgit