[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - svx/source

Armin Le Grand (CIB) Armin.Le.Grand at cib.de
Thu Mar 29 10:38:33 UTC 2018


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

New commits:
commit 1c228e50d88745ec4a35bc068fb8d43ebbeeb5cd
Author: Armin Le Grand <Armin.Le.Grand at cib.de (CIB)>
Date:   Wed Mar 28 16:55:19 2018 +0200

    Allow URL-Check for non-selected TableText
    
    The part to detect a hit on a TableObjectText
    in Draw/Impress for a non-selected Table was
    setting the HitType to SdrHitKind::TextEditObj.
    This prevents the latter happeing check for URL
    (see below). Not directly setting to TextEditObj
    is okay, this is determined and set later. I
    checked various possible changes to keep the
    behaviour as for 'normal' SdrObjects, so please
    be careful when doing changes in the HitTest code
    
    Change-Id: I326a73b88fc56fd902b5052cc3a2ddecf3c3ba61
    Reviewed-on: https://gerrit.libreoffice.org/52016
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>

diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 0640149ea831..19a2b22507a9 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -388,7 +388,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
                     eHit = SDRHIT_CELL;
                     break;
                 case sdr::table::SDRTABLEHIT_CELLTEXTAREA:
-                    eHit = SDRHIT_TEXTEDITOBJ;
+                    // Keep state on UnmarkedObject to allow the below
+                    // 'check for URL field' to be executed, else popups
+                    // for e.g. URL links when hoovering and clicking
+                    // them will not work. Tried several other changes,
+                    // but this oje safely keeps existing behaviour as-is.
+                    eHit = SDRHIT_UNMARKEDOBJECT;
                     break;
                 default:
                     break;


More information about the Libreoffice-commits mailing list