diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-01 15:27:21 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-04 07:25:00 +0100 |
commit | f6b437c57d4b0b032cb7e0838e16572bdf9a05cc (patch) | |
tree | 4cbcdf05171662f1e799c63f438ef7b3c4a0ddcb /avmedia/source/viewer | |
parent | 68f86457525c60f580954280d1a759aa174e8e96 (diff) |
loplugin:singlevalfields
Change-Id: I521d2efa641f3a14c48561e2e0f6d687e5807d93
Reviewed-on: https://gerrit.libreoffice.org/45662
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'avmedia/source/viewer')
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 19 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.hxx | 1 |
2 files changed, 9 insertions, 11 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index f5d77615fb1e..e3045a63ece8 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -122,7 +122,6 @@ MediaWindowImpl::MediaWindowImpl(vcl::Window* pParent, MediaWindow* pMediaWindow , DropTargetHelper(this) , DragSourceHelper(this) , mpMediaWindow(pMediaWindow) - , mbEventTransparent(true) , mpMediaWindowControl(bInternalMediaControl ? VclPtr<MediaWindowControl>::Create(this) : nullptr) , mpEmptyBmpEx(nullptr) , mpAudioBmpEx(nullptr) @@ -637,53 +636,53 @@ void MediaWindowImpl::GetFocus() void MediaWindowImpl::MouseMove(const MouseEvent& rMEvt) { - if (mpMediaWindow && mbEventTransparent) + if (mpMediaWindow) mpMediaWindow->MouseMove(rMEvt); } void MediaWindowImpl::MouseButtonDown(const MouseEvent& rMEvt) { - if (mpMediaWindow && mbEventTransparent) + if (mpMediaWindow) mpMediaWindow->MouseButtonDown(rMEvt); } void MediaWindowImpl::MouseButtonUp(const MouseEvent& rMEvt) { - if (mpMediaWindow && mbEventTransparent) + if (mpMediaWindow) mpMediaWindow->MouseButtonUp(rMEvt); } void MediaWindowImpl::KeyInput(const KeyEvent& rKEvt) { - if (mpMediaWindow && mbEventTransparent) + if (mpMediaWindow) mpMediaWindow->KeyInput(rKEvt); } void MediaWindowImpl::KeyUp(const KeyEvent& rKEvt) { - if (mpMediaWindow && mbEventTransparent) + if (mpMediaWindow) mpMediaWindow->KeyUp(rKEvt); } void MediaWindowImpl::Command(const CommandEvent& rCEvt) { - if (mpMediaWindow && mbEventTransparent) + if (mpMediaWindow) mpMediaWindow->Command(rCEvt); } sal_Int8 MediaWindowImpl::AcceptDrop(const AcceptDropEvent& rEvt) { - return (mpMediaWindow && mbEventTransparent ? mpMediaWindow->AcceptDrop(rEvt) : 0); + return (mpMediaWindow ? mpMediaWindow->AcceptDrop(rEvt) : 0); } sal_Int8 MediaWindowImpl::ExecuteDrop(const ExecuteDropEvent& rEvt) { - return (mpMediaWindow && mbEventTransparent ? mpMediaWindow->ExecuteDrop(rEvt) : 0); + return (mpMediaWindow ? mpMediaWindow->ExecuteDrop(rEvt) : 0); } void MediaWindowImpl::StartDrag(sal_Int8 nAction, const Point& rPosPixel) { - if (mpMediaWindow && mbEventTransparent) + if (mpMediaWindow) mpMediaWindow->StartDrag(nAction, rPosPixel); } diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index 3b100c36e324..bed32852e5ce 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -147,7 +147,6 @@ private: MediaWindow* mpMediaWindow; rtl::Reference<MediaEventListenersImpl> mxEvents; - bool mbEventTransparent; VclPtr<MediaChildWindow> mpChildWindow; VclPtr<MediaWindowControl> mpMediaWindowControl; BitmapEx* mpEmptyBmpEx; |