[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source

[Laurent Godard]

 sc/source/ui/docshell/docsh4.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit bf57bbef91bc40090561d614e4c2070c01aef7cb
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Thu Feb 19 10:45:26 2015 +0100

    tdf#89460 test pChangeTrack before using it
    
    Reviewed-on: https://gerrit.libreoffice.org/14553
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at 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 at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index dd9eaf8..13855e6 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();