[Libreoffice-commits] core.git: sw/source

Jim Raykowski (via logerrit) logerrit at kemper.freedesktop.org
Wed Feb 5 06:14:37 UTC 2020


 sw/source/uibase/utlui/content.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit bc887dffd7fd561160b0963cffd8807e3ad2331e
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Mon Feb 3 18:30:39 2020 -0900
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Feb 5 07:14:07 2020 +0100

    tdf#128814 Add delete to Hyperlinks Navigator context menu
    
    Change-Id: I401ea84aa32e7d01f9fe157eac4d51981550fc76
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87945
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index bb9258bc5599..7cc8bf889998 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -426,7 +426,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 
             m_bEdit = true;
             nOldMemberCount = m_nMemberCount;
-            m_bDelete = false;
+            m_bDelete = true;
         }
         break;
         case ContentTypeId::POSTIT:
@@ -3654,7 +3654,10 @@ void SwContentTree::EditEntry(SvTreeListEntry const * pEntry, EditEntryMode nMod
         break;
 
         case ContentTypeId::URLFIELD:
-            nSlot = SID_EDIT_HYPERLINK;
+            if (nMode == EditEntryMode::DELETE)
+                nSlot = SID_REMOVE_HYPERLINK;
+            else
+                nSlot = SID_EDIT_HYPERLINK;
         break;
         case ContentTypeId::REFERENCE:
             nSlot = FN_EDIT_FIELD;


More information about the Libreoffice-commits mailing list