diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-10 09:07:06 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 10:55:36 +0100 |
| commit | d7a84ce8406096b455d81f50cd50ca2e877adc06 (patch) | |
| tree | b1dd2b5a4860cf2c9664e2ff3087b8dbb9db7576 /avmedia/source | |
| parent | c0a802b59e1edddeb0b621e15137f5058299efd7 (diff) | |
vclwidget: only call dispose() once
by using a new utility method in vcl::Window
This means that we don't have to make all our dispose
methods safe to call more than once.
Change-Id: I2110c7de4a86c70fdc97dd8fd318c86b56865374
Diffstat (limited to 'avmedia/source')
| -rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/framework/mediaplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 698e78bb373d..e6c680e45d3d 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -196,7 +196,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl MediaControl::~MediaControl() { - dispose(); + disposeOnce(); } void MediaControl::dispose() diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index deccd8f17ea4..6f1108aee7cc 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -75,7 +75,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::W MediaFloater::~MediaFloater() { - dispose(); + disposeOnce(); } void MediaFloater::dispose() diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index c43f6829955d..8646e4d41bc9 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -171,7 +171,7 @@ MediaWindowImpl::MediaWindowImpl( vcl::Window* pParent, MediaWindow* pMediaWindo MediaWindowImpl::~MediaWindowImpl() { - dispose(); + disposeOnce(); } void MediaWindowImpl::dispose() |