[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 2 commits - configure.ac editeng/source

[Andras Timar]

 configure.ac                       |    2 +-
 editeng/source/editeng/editeng.cxx |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit cdc3aaea0b1acf492eb70c1099019ff94cb89c37
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Sep 14 13:54:08 2016 +0200

    Bump version to 5.1-6
    
    Change-Id: I421d2e67ff8b1f94184dfebc02a4475cdf85e13d

diff --git a/configure.ac b/configure.ac
index e92986d..a5cc28c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([Collabora Office],[5.1.10.5],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.1.10.6],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit 6c4dfb6ca0727c6e5f9d561e496f448dffb4d87a
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Sep 14 13:52:38 2016 +0200

    fix weird selection problem in desktop editeng
    
    Change-Id: I78c68b5a79db816ea4d0bdf3d75dd1ba4c269106

diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index bf2746c..0902da3 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1351,7 +1351,10 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
     }
 
     pEditView->pImpEditView->SetEditSelection( aCurSel );
-    pEditView->pImpEditView->DrawSelection();
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        pEditView->pImpEditView->DrawSelection();
+    }
     pImpEditEngine->UpdateSelections();
 
     if ( ( !IsVertical() && ( nCode != KEY_UP ) && ( nCode != KEY_DOWN ) ) ||