diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-13 14:50:37 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 21:00:31 +0100 |
commit | 0dfcb43dec1fec3861c87870cc0e5e21ebc06b76 (patch) | |
tree | 29f0783d94db24e1a6727fe1cae427a4367b572e /avmedia/source/viewer/mediawindow_impl.cxx | |
parent | fbe6619a34b617a04a5135e40c70a172a44eefef (diff) |
vcl: VclPtr conversion in avmedia
Change-Id: I6eba828f6d443802361417397cdf643fbd8755c3
Diffstat (limited to 'avmedia/source/viewer/mediawindow_impl.cxx')
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 7a6863b1b2bc..2042858ff758 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -56,12 +56,6 @@ MediaWindowControl::MediaWindowControl( vcl::Window* pParent ) : -MediaWindowControl::~MediaWindowControl() -{ -} - - - void MediaWindowControl::update() { MediaItem aItem; @@ -93,12 +87,6 @@ MediaChildWindow::MediaChildWindow( vcl::Window* pParent, SystemWindowData* pDat } #endif -MediaChildWindow::~MediaChildWindow() -{ -} - - - void MediaChildWindow::MouseMove( const MouseEvent& rMEvt ) { const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ), @@ -183,6 +171,11 @@ MediaWindowImpl::MediaWindowImpl( vcl::Window* pParent, MediaWindow* pMediaWindo MediaWindowImpl::~MediaWindowImpl() { + dispose(); +} + +void MediaWindowImpl::dispose() +{ if( mpEvents ) mpEvents->cleanUp(); @@ -210,6 +203,7 @@ MediaWindowImpl::~MediaWindowImpl() delete mpEmptyBmpEx; delete mpAudioBmpEx; delete mpMediaWindowControl; + Control::dispose(); } uno::Reference< media::XPlayer > MediaWindowImpl::createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType ) |