summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-05-23 12:36:01 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-05-23 14:16:12 +0100
commitcb20d7c3e397a483abeb5eb94ec63a009b3d0cd2 (patch)
tree446657a0711e3a6e0ddfb94b67eab663804cc2dd /sc
parentc5920fe23a0e4b2cb333125f3315063d4a58f2b5 (diff)
coverity#1187682 Dereference null return value
Change-Id: I52740129dc7c6c8d6f47850cf32702ead4643e63
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/xml/xmlcelli.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 4e4c5526b092..def27a91e78f 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1066,7 +1066,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos,
if(!aCellString.isEmpty())
{
- if (bDoIncrement && !IsPossibleErrorString())
+ if (bDoIncrement && !IsPossibleErrorString() && pFCell)
{
ScDocument* pDoc = rXMLImport.GetDocument();
pFCell->SetHybridString(pDoc->GetSharedStringPool().intern(aCellString));
@@ -1075,7 +1075,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos,
else
{
ScAddress aTopLeftMatrixCell;
- if(pFCell->GetMatrixOrigin(aTopLeftMatrixCell))
+ if (pFCell && pFCell->GetMatrixOrigin(aTopLeftMatrixCell))
{
ScFormulaCell* pMatrixCell = rXMLImport.GetDocument()->GetFormulaCell(aTopLeftMatrixCell);
if (pMatrixCell)