diff options
-rw-r--r-- | avmedia/source/framework/mediaplayer.cxx | 8 | ||||
-rw-r--r-- | include/avmedia/mediaplayer.hxx | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index dad2b2ddbd24..717f99369e7f 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -74,8 +74,7 @@ void MediaFloater::dispose() Show(false, ShowFlags::NoFocusChange); SetFloatingMode(false); } - delete mpMediaWindow; - mpMediaWindow = nullptr; + mpMediaWindow.reset(); SfxDockingWindow::dispose(); } @@ -93,15 +92,14 @@ void MediaFloater::ToggleFloatingMode() if (mpMediaWindow) mpMediaWindow->updateMediaItem( aRestoreItem ); - delete mpMediaWindow; - mpMediaWindow = nullptr; + mpMediaWindow.reset(); SfxDockingWindow::ToggleFloatingMode(); if (isDisposed()) return; - mpMediaWindow = new MediaWindow( this, true ); + mpMediaWindow.reset( new MediaWindow( this, true ) ); mpMediaWindow->setPosSize( tools::Rectangle( Point(), GetOutputSizePixel() ) ); mpMediaWindow->executeMediaItem( aRestoreItem ); diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index ac45b92d42ed..12164cdc9308 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -24,6 +24,7 @@ #include <sfx2/dockwin.hxx> #include <sfx2/viewfrm.hxx> #include <avmedia/avmediadllapi.h> +#include <memory> namespace avmedia { @@ -56,7 +57,7 @@ private: virtual void Resize() override; virtual void ToggleFloatingMode() override; - MediaWindow* mpMediaWindow; + std::unique_ptr<MediaWindow> mpMediaWindow; }; inline MediaFloater * getMediaFloater() { |