diff options
author | Laurent Godard <lgodard.libre@laposte.net> | 2015-02-19 10:45:26 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-02-23 10:35:42 +0100 |
commit | c5420c816f3977c5f4002d66561eef8111faecbe (patch) | |
tree | 8a6eb782b220b468b38b97d39c2dea855993cf94 | |
parent | a7a22ede384cc6e8018bdede253266bba36719ea (diff) |
tdf#89460 test pChangeTrack before using it
Reviewed-on: https://gerrit.libreoffice.org/14553
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit bf5c5f359cf4eb36a0a9a1110ec2aa3393bb87df)
Conflicts:
sc/source/ui/docshell/docsh4.cxx
Change-Id: Ic02351c448929daa7d4c5a9a00df9842c2c5aa91
Reviewed-on: https://gerrit.libreoffice.org/14558
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit bf57bbef91bc40090561d614e4c2070c01aef7cb)
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index dd9eaf8a585a..13855e64163c 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -590,8 +590,11 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( bDo ) { - if ( pChangeTrack->IsProtected() ) - bDo = ExecuteChangeProtectionDialog( NULL ); + if (pChangeTrack) + { + if ( pChangeTrack->IsProtected() ) + bDo = ExecuteChangeProtectionDialog( NULL ); + } if ( bDo ) { pDoc->EndChangeTracking(); |