[Libreoffice-commits] core.git: sc/source

[Markus Mohrhard]

 sc/source/ui/view/tabvwsh4.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 2fd7c18f42710bdaaf3262f4be9f1a706b33d38d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Feb 14 02:25:32 2018 +0100

    it does not make sense to check for nullptr and then access anyway
    
    Seems to be related to the crashreports with the signatures:
    http://crashreport.libreoffice.org/stats/signature/ScTabViewShell::~ScTabViewShell()
    http://crashreport.libreoffice.org/stats/signature/ScInputHandler::EnterHandler(ScEnterMode)
    
    Change-Id: Iff22db3988687a52a7596f01facd5bdd12ce4140
    Reviewed-on: https://gerrit.libreoffice.org/49694
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 5c0b1e8ab594..55caac70a18f 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1774,10 +1774,12 @@ ScTabViewShell::~ScTabViewShell()
     // all to NULL, in case the TabView-dtor tries to access them
     //! (should not really! ??!?!)
     if (mpInputHandler)
+    {
         mpInputHandler->SetDocumentDisposing(true);
-    // We end edit mode, before destroying the input handler and the edit engine
-    // and before end listening (in order to call ScTabViewShell::KillEditView())
-    mpInputHandler->EnterHandler();
+        // We end edit mode, before destroying the input handler and the edit engine
+        // and before end listening (in order to call ScTabViewShell::KillEditView())
+        mpInputHandler->EnterHandler();
+    }
 
     ScDocShell* pDocSh = GetViewData().GetDocShell();
     EndListening(*pDocSh);