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

[Pranam Lashkari (via logerrit)]

 editeng/source/editeng/impedit.cxx |    2 +-
 sw/source/core/crsr/crstrvl.cxx    |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit a8c20a46efac1ef35981b48c4c8b522ad946e744
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Mon Feb 1 22:18:01 2021 +0530
Commit:     Pranam Lashkari <lpranam at collabora.com>
CommitDate: Wed Feb 3 17:24:09 2021 +0100

    enable hyperlink to be detected at the end of text
    
    now in online hyperlink popup will appear
    even when the cursor is at the end of hyperlink text
    
    Change-Id: I80a1a093afa11e39236693f8a2639741f74c9876
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110264
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 01ce0265fd3c..00d947a7fcdd 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1789,7 +1789,7 @@ const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_Int32* pPara,
     for (size_t nAttr = rAttrs.size(); nAttr; )
     {
         const EditCharAttrib& rAttr = *rAttrs[--nAttr];
-        if (rAttr.GetStart() == nXPos)
+        if (rAttr.GetStart() == nXPos || rAttr.GetEnd() == nXPos)
         {
             if (rAttr.Which() == EE_FEATURE_FIELD)
             {
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 9153b8b34e85..598863781a69 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1571,8 +1571,11 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
                      && IsAttrAtPos::InetAttr & rContentAtPos.eContentAtPos
                      && !aTmpState.m_bFootnoteNoInfo )
                 {
-                    pTextAttr = pTextNd->GetTextAttrAt(
-                            aPos.nContent.GetIndex(), RES_TXTATR_INETFMT);
+                    sal_Int32 index = aPos.nContent.GetIndex();
+                    pTextAttr = pTextNd->GetTextAttrAt(index, RES_TXTATR_INETFMT);
+
+                    if(!pTextAttr && index > 0)
+                        pTextAttr = pTextNd->GetTextAttrAt(index - 1, RES_TXTATR_INETFMT);
                     // "detect" only INetAttrs with URLs
                     if( pTextAttr && !pTextAttr->GetINetFormat().GetValue().isEmpty() )
                     {