From 31342a1bda26f4e3dd29274dafd306fd0a9e7047 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 30 Sep 2020 14:11:54 +0100 Subject: tdf#134566 accept input engine commands in editview in custom widget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for the generic case first Change-Id: I10bd707900b54c70c9bda79d5d09532cc159779e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103692 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sw/source/ui/dbui/mmaddressblockpage.cxx | 6 +++--- sw/source/ui/dbui/mmaddressblockpage.hxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sw/source/ui') diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 20bcb4fd735a..984ab547b1d9 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1404,7 +1404,7 @@ void AddressMultiLineEdit::UpdateFields() m_aSelectionLink.Call(false); } -void AddressMultiLineEdit::EditViewSelectionChange() const +void AddressMultiLineEdit::EditViewSelectionChange() { WeldEditView::EditViewSelectionChange(); m_aSelectionLink.Call(true); @@ -1541,7 +1541,7 @@ namespace }; } -css::uno::Reference AddressMultiLineEdit::GetDropTarget() const +css::uno::Reference AddressMultiLineEdit::GetDropTarget() { if (!m_xDropTarget.is()) { @@ -1549,7 +1549,7 @@ css::uno::Reference AddressMultiLineEdit::G DropTargetListener* pProxy = new DropTargetListener(xRealDropTarget, m_pParentDialog); uno::Reference xListener(pProxy); xRealDropTarget->addDropTargetListener(xListener); - const_cast(this)->m_xDropTarget = uno::Reference(pProxy); + m_xDropTarget = uno::Reference(pProxy); } return m_xDropTarget; } diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index d646f9ca8b7b..8170b9193211 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -142,8 +142,8 @@ class AddressMultiLineEdit : public WeldEditView css::uno::Reference m_xDropTarget; - virtual void EditViewSelectionChange() const override; - virtual css::uno::Reference GetDropTarget() const override; + virtual void EditViewSelectionChange() override; + virtual css::uno::Reference GetDropTarget() override; virtual bool KeyInput(const KeyEvent& rKEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; -- cgit