diff options
author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-12-03 16:40:27 +0100 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-12-04 09:56:25 +0100 |
commit | f67e9aeeb1bd6fe82e0c4e851017962c74723213 (patch) | |
tree | 27058fa6ba1d6047d296469eee5e42a834bbe60c /vcl/inc | |
parent | 486268cc87907a399649bd4612078031dce262d4 (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>
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/qt5/Qt5DragAndDrop.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/qt5/Qt5Widget.hxx | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/vcl/inc/qt5/Qt5DragAndDrop.hxx b/vcl/inc/qt5/Qt5DragAndDrop.hxx index dc5b52678d0a..f5ffac3bb21e 100644 --- a/vcl/inc/qt5/Qt5DragAndDrop.hxx +++ b/vcl/inc/qt5/Qt5DragAndDrop.hxx @@ -58,6 +58,9 @@ public: void dragFailed(); void fire_dragEnd(sal_Int8 nAction); + + static Qt5DragSource* m_ActiveDragSource; + css::uno::Reference<css::datatransfer::XTransferable> const& GetTransferable() const { return m_xTrans; diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx index 9d4d535d2e90..9f14d44fd5ef 100644 --- a/vcl/inc/qt5/Qt5Widget.hxx +++ b/vcl/inc/qt5/Qt5Widget.hxx @@ -56,6 +56,8 @@ class Qt5Widget : public QWidget virtual void wheelEvent(QWheelEvent*) override; virtual void closeEvent(QCloseEvent*) override; + const QString m_InternalMimeType = "application/x-libreoffice-dnditem"; + public: Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f = Qt::WindowFlags()); Qt5Frame* m_pFrame; |