diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-02-14 02:25:32 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-14 15:47:10 +0100 |
commit | 9e8e6cf5441bbdb09b890e16c14c495bdda4e624 (patch) | |
tree | 51fe14034bacb74f01723769e7d91263cd003498 /sc/source/ui/view | |
parent | 5054456a6ed8ef7cd2a05fb09e1954eb02eaf0f7 (diff) |
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@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 2fd7c18f42710bdaaf3262f4be9f1a706b33d38d)
Reviewed-on: https://gerrit.libreoffice.org/49700
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
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); |