[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/svx svx/source

[Caolán McNamara (via logerrit)]

 include/svx/svdedxv.hxx       |    1 +
 svx/source/svdraw/svdedxv.cxx |    7 +++++++
 2 files changed, 8 insertions(+)

New commits:
commit 0c52361286d11d34544ec0deedc6962103b3e832
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jan 22 11:22:41 2021 +0000
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Jan 26 10:37:59 2021 +0100

    tdf#139590 Drag and drop doesn't work in SdrObjEditView
    
    Change-Id: Id8deeee0c1a919f330bc6623f708453279a214c8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109793
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index ce8bf4b1f480..35c4be3282c1 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -68,6 +68,7 @@ class SVXCORE_DLLPUBLIC SdrObjEditView : public 
SdrGlueEditView, public EditView
     virtual void EditViewInvalidate(const tools::Rectangle& rRect) override;
     virtual void EditViewSelectionChange() override;
     virtual OutputDevice& EditViewOutputDevice() const override;
+    virtual css::uno::Reference<css::datatransfer::dnd::XDropTarget> 
GetDropTarget() override;
     virtual void EditViewInputContext(const InputContext& rInputContext) 
override;
     virtual void EditViewCursorRect(const tools::Rectangle& rRect, int 
nExtTextInputWidth) override;
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index d761998f540c..8220b4c59b03 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -655,6 +655,13 @@ void SdrObjEditView::EditViewSelectionChange()
 
 OutputDevice& SdrObjEditView::EditViewOutputDevice() const { return 
*pTextEditWin; }
 
+css::uno::Reference<css::datatransfer::dnd::XDropTarget> 
SdrObjEditView::GetDropTarget()
+{
+    if (!pTextEditWin)
+        return nullptr;
+    return pTextEditWin->GetDropTarget();
+}
+
 void SdrObjEditView::EditViewInputContext(const InputContext& rInputContext)
 {
     if (!pTextEditWin)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits