diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-09 07:44:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-13 12:27:08 +0100 |
| commit | e3290499009492e39e5ddd870d314bb5df494199 (patch) | |
| tree | 6ffaa7c199e74791ed1a2aa8a74a0a528509a02f /slideshow | |
| parent | 8709c643136eed67bc8f04ab9465b4a76085747c (diff) | |
loplugin singlevalfields improvement
checking for casting to void* turns out to mask useful stuff, so
remove that and just deal with a few extra false+
Change-Id: Id9700d7ceda90ba8fdb38aa870f13a7ca3acb668
Reviewed-on: https://gerrit.libreoffice.org/63145
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.cxx | 13 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.hxx | 1 |
2 files changed, 1 insertions, 13 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index d8dcb2bbf4d6..f61c6dd598d9 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -76,7 +76,6 @@ namespace slideshow const uno::Reference< drawing::XShape >& rxShape, const uno::Reference< uno::XComponentContext >& rxContext ) : mpViewLayer( rViewLayer ), - mpEventHandlerParent(nullptr), maWindowOffset( 0, 0 ), maBounds(), mxShape( rxShape ), @@ -137,7 +136,6 @@ namespace slideshow } mpMediaWindow.disposeAndClear(); - mpEventHandlerParent.disposeAndClear(); // shutdown player if( mxPlayer.is() ) @@ -257,15 +255,7 @@ namespace slideshow if( mpMediaWindow.get() ) { - if( mpEventHandlerParent ) - { - mpEventHandlerParent->SetPosSizePixel( aPosPixel, aSizePixel ); - mpMediaWindow->SetPosSizePixel( Point(0,0), aSizePixel ); - } - else - { - mpMediaWindow->SetPosSizePixel( aPosPixel, aSizePixel ); - } + mpMediaWindow->SetPosSizePixel( aPosPixel, aSizePixel ); mxPlayerWindow->setPosSize( 0, 0, aSizePixel.Width(), aSizePixel.Height(), 0 ); @@ -483,7 +473,6 @@ namespace slideshow //if there was no playerwindow, then clear the mpMediaWindow too //so that we can draw a placeholder instead in that space mpMediaWindow.disposeAndClear(); - mpEventHandlerParent.disposeAndClear(); } } } diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index a95ba95e2080..53fc804d4633 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -148,7 +148,6 @@ namespace slideshow const OUString& rMimeType ); ViewLayerSharedPtr const mpViewLayer; VclPtr< SystemChildWindow > mpMediaWindow; - VclPtr< vcl::Window > mpEventHandlerParent; mutable css::awt::Point maWindowOffset; mutable ::basegfx::B2DRectangle maBounds; |