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
This commit is contained in:
Juergen Spitzmueller 2016-12-29 09:17:53 +01:00
parent 03754c327e
commit 54fa0d51da
2 changed files with 7 additions and 5 deletions

View File

@ -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()){

View File

@ -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