[Libreoffice-commits] core.git: editeng/source
Andras Timar
andras.timar at collabora.com
Wed Sep 14 14:17:19 UTC 2016
editeng/source/editeng/editeng.cxx | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 486f9064367fd99029ba34a36486e3d70773131a
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Sep 14 15:59:56 2016 +0200
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 4a87e92..3047c4c 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 ) ) ||
More information about the Libreoffice-commits
mailing list