diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-12-03 16:40:27 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2018-12-14 14:30:32 +0100 |
| commit | bb7bf732bae1e2f4ebf0ed4e0307dbd63dade1d0 (patch) | |
| tree | 07c199313b15fc764af5eb92833f679b619bf537 /vcl/qt5/Qt5Frame.cxx | |
| parent | 1a8cb9df631d820ed488cb6faafacbbf11a3f913 (diff) | |
tdf#120775: Implement DnD between 2 SalFrames
still only internal DnD (between multiple frames within 1 LibO
instance) is supported
Change-Id: I151162ee1075c8b2d71520aae950fc7214d752b7
Reviewed-on: https://gerrit.libreoffice.org/64477
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit f67e9aeeb1bd6fe82e0c4e851017962c74723213)
Reviewed-on: https://gerrit.libreoffice.org/65152
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl/qt5/Qt5Frame.cxx')
| -rw-r--r-- | vcl/qt5/Qt5Frame.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index 9304760a47c0..3ab8ead48f50 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -1014,6 +1014,9 @@ void Qt5Frame::SetApplicationID(const OUString&) } // Drag'n'drop foo + +Qt5DragSource* Qt5DragSource::m_ActiveDragSource; + void Qt5Frame::registerDragSource(Qt5DragSource* pDragSource) { assert(!m_pDragSource); @@ -1053,7 +1056,7 @@ void Qt5Frame::draggingStarted(const int x, const int y) aEvent.SourceActions = css::datatransfer::dnd::DNDConstants::ACTION_MOVE; css::uno::Reference<css::datatransfer::XTransferable> xTransferable; - xTransferable = m_pDragSource->GetTransferable(); + xTransferable = Qt5DragSource::m_ActiveDragSource->GetTransferable(); if (!m_bInDrag && xTransferable.is()) { @@ -1082,7 +1085,7 @@ void Qt5Frame::dropping(const int x, const int y) aEvent.SourceActions = css::datatransfer::dnd::DNDConstants::ACTION_MOVE; css::uno::Reference<css::datatransfer::XTransferable> xTransferable; - xTransferable = m_pDragSource->GetTransferable(); + xTransferable = Qt5DragSource::m_ActiveDragSource->GetTransferable(); aEvent.Transferable = xTransferable; m_pDropTarget->fire_drop(aEvent); |