diff options
| author | Noel Grandin <noel@peralex.com> | 2015-06-11 16:00:03 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-06-13 16:50:56 +0000 |
| commit | c2d65e08c9f6e35875eed1a4eea3af614478b801 (patch) | |
| tree | 2c7152560fe57aec51197e4d9768c37170063afb /avmedia | |
| parent | 9f3515f90c7b05d5f387dc15e2d6c10892e208bb (diff) | |
tdf#91960 presentation causes Impress crash
The SystenChildWindow in question is owned by ViewMediaShape
Fixed ViewMediaShape to dispose the vcl objects it creates correctly.
Also fix another crash in MediaWindowImpl child window correctly disposing its children.
Change-Id: If4aebcb6e5824266c154416f7246d73c6cb3509c
Reviewed-on: https://gerrit.libreoffice.org/16230
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 3108df45d8c9..6e7934890e8c 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -51,7 +51,10 @@ MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) : -MediaWindow::~MediaWindow() {} +MediaWindow::~MediaWindow() +{ + mpImpl.disposeAndClear(); +} |