[LyX/2.2.x] Fix two hyperlink-insert problems

[Juergen Spitzmueller]

commit 54fa0d51da514e2ac8b66b632116a1d5ec3dd5aa
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Thu Dec 29 09:17:53 2016 +0100

    Fix two hyperlink-insert problems
    
    1. Do not prematurely cut selection (#10306); patch proposed by Daniel 
Ramöller
    2. Obey lfun argument, even if there is a selection
---
 src/Text3.cpp |    6 +-----
 status.22x    |    6 ++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 710737e..36eded9 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1756,13 +1756,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        }
 
        case LFUN_HREF_INSERT: {
-               // FIXME If we're actually given an argument, shouldn't
-               // we use it, whether or not we have a selection?
                docstring content = cmd.argument();
-               if (cur.selection()) {
+               if (content.empty() && cur.selection())
                        content = cur.selectionAsString(false);
-                       cutSelection(cur, true, false);
-               }
 
                InsetCommandParams p(HYPERLINK_CODE);
                if (!content.empty()){
diff --git a/status.22x b/status.22x
index 11c734a..d600c4b 100644
--- a/status.22x
+++ b/status.22x
@@ -162,6 +162,12 @@ What's new
 - Fix display and output of math macros with optional arguments appearing
   in the optional argument of another macro.
 
+- Do not prematurely cut selected text when inserting a Hyperref (bug 10306).
+
+- Consider the argument of the hyperref-insert function even if there is a
+  selection.
+
+
 * INTERNALS