From 4ed467ccc8f69c056a380f9b07ad8871e11f7d37 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 4 Feb 2016 11:27:51 +0000 Subject: coverity#1326426 Dereference null return value Change-Id: I8ac0a0df5e111b72db181ee1b8043e6f65fbaf25 --- .../openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java | 6 +++++- 1 file changed, 5 insertions(+), 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 2604bf706c08..4c573a7b6ef4 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 @@ -537,16 +537,20 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, styleName = tableStyleNode.getNodeValue(); } + CellStyle cStyle = null; + if(styleName.equalsIgnoreCase("Default")) { Debug.log(Debug.TRACE, "No defined Style Attribute was found"); } else if(styleName.length()!=0) { - CellStyle cStyle = (CellStyle)styleCat.lookup(styleName, + cStyle = (CellStyle)styleCat.lookup(styleName, SxcConstants.TABLE_CELL_STYLE_FAMILY, null, CellStyle.class); + } + if (cStyle != null) { Format definedFormat = cStyle.getFormat(); fmt = new Format(definedFormat); } -- cgit ibreoffice-6-0'>distro/cib/libreoffice-6-0 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2018-02-07 17:10:44 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2018-02-08 01:27:52 +0100
commit609888f3c8d6c0fe72c41ac26de431a12ad3fdd0 (patch)
treea46193769973eb1a2f54de7e6d666e48f28797d2 /avmedia
parent30083601334279f33a3021dfe7d22970d02c8e9e (diff)
starmath: Make SmParser::DoAttribut() etc. return std::unique_ptr