summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-24 10:33:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-10-24 13:43:08 +0100
commitbf0075b2331dd523b88b6d5ec61ec4e10d8a000c (patch)
tree5ce0ff789551911e89de906cc1ae4e26153a9756
parent66d105b10adaa2587c0a929df7a211d3d7c1fa4e (diff)
coverity#1242428 Explicit null dereferenced
Change-Id: I107aed3c0fb9f558473777eb5613465c7d60f2be
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 90a42345bb38..5fbd90f0cb02 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -707,7 +707,7 @@ void ScConflictsDlg::UpdateView()
ScChangeActionList::const_iterator aEndOwn = aItr->maOwnActions.end();
for ( ScChangeActionList::const_iterator aItrOwn = aItr->maOwnActions.begin(); aItrOwn != aEndOwn; ++aItrOwn )
{
- ScChangeAction* pAction = mpOwnTrack->GetAction( *aItrOwn );
+ ScChangeAction* pAction = mpOwnTrack ? mpOwnTrack->GetAction(*aItrOwn) : NULL;
if ( pAction )
{
// only display own top content entries