summaryrefslogtreecommitdiff
path: root/sfx2/source/appl/app.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-08-12 14:40:09 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-08-13 15:21:29 +0200
commiteaf094f7f2699e786deaa8cfadad26507b30a92b (patch)
tree66395e223006706085eafb74835ae1847371342d /sfx2/source/appl/app.cxx
parentce6c6a5ad6c9dde09bb0bb0c51e16d828cfe0ef7 (diff)
use unique_ptr in SfxAppData_Impl
and simplify the destruction - we only ever called ReleaseInterface on destruction, so no need to bother with that, and risk touching pointers that might be nullptr Specifically, the problem is this code pImpl->pSlotPool.reset(); which triggered the path ~SfxSlotPool -> ~SfxInterface -> SfxGetpApp()->GetAppSlotPool_Impl() which crashes because the pSlotPool pointer is null at that point Change-Id: I8577760d09be598926623d6eb5500969e07dd6f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100624 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/appl/app.cxx')
-rw-r--r--sfx2/source/appl/app.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 6844f919c4b2..fbd45b3e49b3 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -235,7 +235,7 @@ void SfxApplication::ResetLastDir()
SfxDispatcher* SfxApplication::GetDispatcher_Impl()
{
- return pImpl->pViewFrame? pImpl->pViewFrame->GetDispatcher(): pImpl->pAppDispat;
+ return pImpl->pViewFrame ? pImpl->pViewFrame->GetDispatcher() : pImpl->pAppDispat.get();
}