anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 19:59:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix two hyperlink-insert problems

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Text3.cpp
View File

@ -1756,13 +1756,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
} }
case LFUN_HREF_INSERT: { 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(); docstring content = cmd.argument();
if (cur.selection()) { if (content.empty() && cur.selection())
content = cur.selectionAsString(false); content = cur.selectionAsString(false);
cutSelection(cur, true, false);
}
InsetCommandParams p(HYPERLINK_CODE); InsetCommandParams p(HYPERLINK_CODE);
if (!content.empty()){ if (!content.empty()){

6
status.22x
View File

@ -162,6 +162,12 @@ What's new
- Fix display and output of math macros with optional arguments appearing - Fix display and output of math macros with optional arguments appearing
in the optional argument of another macro. 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 * INTERNALS