diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-24 10:34:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-24 13:43:08 +0100 |
| commit | 109c9e9fa5ffe55bd672c99c3cdb741aac1060eb (patch) | |
| tree | 026fdeb54b9d8748dbcf335a47abb49293762b0c | |
| parent | bf0075b2331dd523b88b6d5ec61ec4e10d8a000c (diff) | |
coverity#1242427 Explicit null dereferenced
Change-Id: I768b9596432b95e0152011951bf366eb41da6b53
| -rw-r--r-- | sc/source/ui/miscdlgs/conflictsdlg.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 5fbd90f0cb02..61df8e219500 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -686,7 +686,7 @@ void ScConflictsDlg::UpdateView() ScChangeActionList::const_iterator aEndShared = aItr->maSharedActions.end(); for ( ScChangeActionList::const_iterator aItrShared = aItr->maSharedActions.begin(); aItrShared != aEndShared; ++aItrShared ) { - ScChangeAction* pAction = mpSharedTrack->GetAction( *aItrShared ); + ScChangeAction* pAction = mpSharedTrack ? mpSharedTrack->GetAction(*aItrShared) : NULL; if ( pAction ) { // only display shared top content entries |