diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-30 14:11:54 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-10-06 09:50:51 +0200 |
| commit | 9987804b732b679e0ad969517e8bd49cf1061fa9 (patch) | |
| tree | b52416e1a341c75b98f95d409f5fd842df9d0f84 /svx | |
| parent | c426d851fd7a66f826d08691d19ff288a636a445 (diff) | |
tdf#134566 accept input engine commands in editview in custom widget
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 <caolanm@redhat.com>
(cherry picked from commit 31342a1bda26f4e3dd29274dafd306fd0a9e7047)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103720
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 40aacd3474fb..851a73043535 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -619,7 +619,7 @@ void TextEditOverlayObject::checkSelectionChange() // callback from the active EditView, forward to evtl. existing instances of the // TextEditOverlayObject(s). This will additionally update the selection which // is an integral part of the text visualization -void SdrObjEditView::EditViewInvalidate(const tools::Rectangle&) const +void SdrObjEditView::EditViewInvalidate(const tools::Rectangle&) { if (IsTextEdit()) { @@ -643,7 +643,7 @@ void SdrObjEditView::EditViewInvalidate(const tools::Rectangle&) const // callback from the active EditView, forward to evtl. existing instances of the // TextEditOverlayObject(s). This cvall *only* updates the selection visualization // which is e.g. used when only the selection is changed, but not the text -void SdrObjEditView::EditViewSelectionChange() const +void SdrObjEditView::EditViewSelectionChange() { if (IsTextEdit()) { @@ -662,7 +662,14 @@ void SdrObjEditView::EditViewSelectionChange() const OutputDevice& SdrObjEditView::EditViewOutputDevice() const { return *pTextEditWin; } -void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) const +void SdrObjEditView::EditViewInputContext(const InputContext& rInputContext) +{ + if (!pTextEditWin) + return; + pTextEditWin->SetInputContext(rInputContext); +} + +void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) { if (!comphelper::LibreOfficeKit::isActive()) { |