[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-0' - sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/doc/objxtor.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 78d3a5e26fae5f957c082e798e18808f0624bc4a
Author:     Markus Mohrhard <markus.mohrhard at googlemail.com>
AuthorDate: Sat Jul 21 01:57:27 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 27 10:05:45 2018 +0200

    fix shutdown crash when SfxApplication has already been destroyed
    
    See e.g. http://crashreport.libreoffice.org/stats/crash_details/dc1ae6ff-923e-44f6-99a9-84893039efd7
    
    Change-Id: I3b5a24bfb62977ca922bf3bececb6676691bf6ea
    Reviewed-on: https://gerrit.libreoffice.org/57789
    Tested-by: Jenkins
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 715fcaff01ed048c52c69264a7a0fb773dd57b32)
    Reviewed-on: https://gerrit.libreoffice.org/57808
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 7b62c5266e62c3fb0ce1285949d51020075a3f81)
    Reviewed-on: https://gerrit.libreoffice.org/57858
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index a71748111969..88270d13f4a2 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -313,13 +313,13 @@ SfxObjectShell::~SfxObjectShell()
     DELETEZ( pImpl->pReloadTimer );
 
     SfxApplication *pSfxApp = SfxGetpApp();
-    if ( USHRT_MAX != pImpl->nVisualDocumentNumber )
+    if ( USHRT_MAX != pImpl->nVisualDocumentNumber && pSfxApp )
         pSfxApp->ReleaseIndex(pImpl->nVisualDocumentNumber);
 
     // Destroy Basic-Manager
     pImpl->aBasicManager.reset( nullptr );
 
-    if ( pSfxApp->GetDdeService() )
+    if ( pSfxApp && pSfxApp->GetDdeService() )
         pSfxApp->RemoveDdeTopic( this );
 
     pImpl->pBaseModel.set( nullptr );