Kaydet (Commit) 89507e35 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in MediaFloater

Change-Id: Ibdf838b630fdd63f549b59f69ee05c2030326fa5
Reviewed-on: https://gerrit.libreoffice.org/54175Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 5c3816cc
...@@ -74,8 +74,7 @@ void MediaFloater::dispose() ...@@ -74,8 +74,7 @@ void MediaFloater::dispose()
Show(false, ShowFlags::NoFocusChange); Show(false, ShowFlags::NoFocusChange);
SetFloatingMode(false); SetFloatingMode(false);
} }
delete mpMediaWindow; mpMediaWindow.reset();
mpMediaWindow = nullptr;
SfxDockingWindow::dispose(); SfxDockingWindow::dispose();
} }
...@@ -93,15 +92,14 @@ void MediaFloater::ToggleFloatingMode() ...@@ -93,15 +92,14 @@ void MediaFloater::ToggleFloatingMode()
if (mpMediaWindow) if (mpMediaWindow)
mpMediaWindow->updateMediaItem( aRestoreItem ); mpMediaWindow->updateMediaItem( aRestoreItem );
delete mpMediaWindow; mpMediaWindow.reset();
mpMediaWindow = nullptr;
SfxDockingWindow::ToggleFloatingMode(); SfxDockingWindow::ToggleFloatingMode();
if (isDisposed()) if (isDisposed())
return; return;
mpMediaWindow = new MediaWindow( this, true ); mpMediaWindow.reset( new MediaWindow( this, true ) );
mpMediaWindow->setPosSize( tools::Rectangle( Point(), GetOutputSizePixel() ) ); mpMediaWindow->setPosSize( tools::Rectangle( Point(), GetOutputSizePixel() ) );
mpMediaWindow->executeMediaItem( aRestoreItem ); mpMediaWindow->executeMediaItem( aRestoreItem );
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <sfx2/dockwin.hxx> #include <sfx2/dockwin.hxx>
#include <sfx2/viewfrm.hxx> #include <sfx2/viewfrm.hxx>
#include <avmedia/avmediadllapi.h> #include <avmedia/avmediadllapi.h>
#include <memory>
namespace avmedia namespace avmedia
{ {
...@@ -56,7 +57,7 @@ private: ...@@ -56,7 +57,7 @@ private:
virtual void Resize() override; virtual void Resize() override;
virtual void ToggleFloatingMode() override; virtual void ToggleFloatingMode() override;
MediaWindow* mpMediaWindow; std::unique_ptr<MediaWindow> mpMediaWindow;
}; };
inline MediaFloater * getMediaFloater() { inline MediaFloater * getMediaFloater() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment