diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-18 16:08:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-18 16:09:54 +0100 |
| commit | 1ea14bb0bbb7ca79c0a60a1041243bbebda31e18 (patch) | |
| tree | ce03d1bdc05a3faae4ba301eccc7665cb803a777 /sd/source/ui/dlg/dlgass.cxx | |
| parent | d59125638bf4c58507d4311f614abc429c7b3b8d (diff) | |
Resolves: tdf#95620 crash in presentation wizard
possibly a regression from VclPtr or maybe from
VclBuilder, or a bit of both.
Change-Id: I46acf07e219334547429da7b2983d5be9cdb6ef8
Diffstat (limited to 'sd/source/ui/dlg/dlgass.cxx')
| -rw-r--r-- | sd/source/ui/dlg/dlgass.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 5f4a8caed73b..95caa0e7990a 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -656,6 +656,12 @@ AssistentDlgImpl::AssistentDlgImpl( vcl::Window* pWindow, const Link<ListBox&,vo AssistentDlgImpl::~AssistentDlgImpl() { + //tdf#95620 we need to have mpPreview disposed before the DocShell is + //destroyed, and not after. Because if the preview's slideshow is active + //then the slideshow accesses the medium belonging to this DocShell in + //its disposing. + mpPreview.disposeAndClear(); + CloseDocShell(); DeletePasswords(); |