[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svx/source

[merttumer (via logerrit)]

 svx/source/svdraw/svdview.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e7ef006f2f3d27904618adf59dd8b2f2c403f30a
Author:     merttumer <mert.tumer at collabora.com>
AuthorDate: Wed Apr 21 12:05:07 2021 +0300
Commit:     Mert Tumer <mert.tumer at collabora.com>
CommitDate: Thu Apr 22 09:17:34 2021 +0200

    lok: Edit the click selected cell on table selection
    
    for LOK case, it should start editing when table is selected
    from the cell that is under the cursor instead of selecting the
    table object.
    
    Change-Id: Ibb3fa41377b76edcdcc2be7419838a151ff765fe
    Signed-off-by: merttumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114386
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index bb677b7707e6..2c784b6a6e2e 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -56,6 +56,7 @@
 #include <svx/sdr/contact/objectcontactofpageview.hxx>
 #include <sal/log.hxx>
 #include <vcl/ptrstyle.hxx>
+#include <comphelper/lok.hxx>
 
 
 SdrViewEvent::SdrViewEvent()
@@ -385,7 +386,9 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
                     // for e.g. URL links when hoovering and clicking
                     // them will not work. Tried several other changes,
                     // but this one safely keeps existing behaviour as-is.
-                    eHit = SdrHitKind::UnmarkedObject;
+                    // Except for the LOK. LOK doesn't have hoovering popup
+                    // feature.
+                    eHit = comphelper::LibreOfficeKit::isActive() ? SdrHitKind::TextEditObj : SdrHitKind::UnmarkedObject;
                     break;
                 default:
                     break;