diff options
author | Andras Timar <andras.timar@collabora.com> | 2016-09-14 15:59:56 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-14 14:16:35 +0000 |
commit | 486f9064367fd99029ba34a36486e3d70773131a (patch) | |
tree | bb48c97b2061a96ace1a22c263c5c3e7c05d614a /editeng | |
parent | 16bbeb5713f4f9894e81ecf34a0e00f56a425f96 (diff) |
Revert 8c4dbcef8f and provide a better fix
This reverts commit 8c4dbcef8f92c9bd1c2208e7de7971f184f8a3ff.
bccu#1781 bug was in LibreOffice Online. After deletion of the selected
editeng text, the selection did not disappear. By making the fix conditional
to LibreOfficeKit::isActive(), we can avoid the weird selection problem in
desktop editeng.
Change-Id: I78c68b5a79db816ea4d0bdf3d75dd1ba4c269106
Reviewed-on: https://gerrit.libreoffice.org/28900
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 4a87e92064f9..3047c4cec16f 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/lok.hxx> #include <vcl/wrkwin.hxx> #include <vcl/dialog.hxx> #include <vcl/msgbox.hxx> @@ -1349,6 +1350,10 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v } pEditView->pImpEditView->SetEditSelection( aCurSel ); + if (comphelper::LibreOfficeKit::isActive()) + { + pEditView->pImpEditView->DrawSelection(); + } pImpEditEngine->UpdateSelections(); if ( ( !IsVertical() && ( nCode != KEY_UP ) && ( nCode != KEY_DOWN ) ) || |