allow dnd into weldeditview
Change-Id: I42fafed01a3884279781642154656f0ee32ad431
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114846
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/include/svx/weldeditview.hxx b/include/svx/weldeditview.hxx
index 1f388cb..c40a754 100644
--- a/include/svx/weldeditview.hxx
+++ b/include/svx/weldeditview.hxx
@@ -49,6 +49,8 @@ public:
protected:
bool m_bAcceptsTab;
// m_xDropTarget must outlive m_xEditView
css::uno::Reference<css::datatransfer::dnd::XDropTarget> m_xDropTarget;
std::unique_ptr<EditEngine> m_xEditEngine;
std::unique_ptr<EditView> m_xEditView;
rtl::Reference<WeldEditAccessible> m_xAccessible;
@@ -69,6 +71,8 @@ protected:
virtual void LoseFocus() override;
virtual void Resize() override;
virtual css::uno::Reference<css::datatransfer::dnd::XDropTarget> GetDropTarget() override;
// Whether Tab will result in entering a tab or not
bool GetAcceptsTab() const { return m_bAcceptsTab; }
diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx
index 6e83d07..83f24e8 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -1603,6 +1603,13 @@ void WeldEditView::LoseFocus()
}
}
css::uno::Reference<css::datatransfer::dnd::XDropTarget> WeldEditView::GetDropTarget()
{
if (!m_xDropTarget)
m_xDropTarget = weld::CustomWidgetController::GetDropTarget();
return m_xDropTarget;
}
namespace
{
class WeldEditViewUIObject final : public DrawingAreaUIObject
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 8170b91..1ab100c 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -140,8 +140,6 @@ class AddressMultiLineEdit : public WeldEditView
Link<AddressMultiLineEdit&,void> m_aModifyLink;
SwCustomizeAddressBlockDialog* m_pParentDialog;
css::uno::Reference<css::datatransfer::dnd::XDropTarget> m_xDropTarget;
virtual void EditViewSelectionChange() override;
virtual css::uno::Reference<css::datatransfer::dnd::XDropTarget> GetDropTarget() override;
