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

Amend 9464f0526e

Browse Source 
Simplify function
This commit is contained in:
Juergen Spitzmueller 2024-07-30 15:30:41 +02:00
parent 9464f0526e
commit 9fc1194494
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/BufferView.cpp
View File

@ -1667,7 +1667,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
case LFUN_REFERENCE_TO_PARAGRAPH: { case LFUN_REFERENCE_TO_PARAGRAPH: {
vector<string> const pids = getVectorFromString(cmd.getArg(0)); vector<string> const pids = getVectorFromString(cmd.getArg(0));
string const type = cmd.getArg(1); string const type = cmd.getArg(1);
int id = convert<int>(pids.front()); int id = convert<int>(pids.back());
if (id < 0) if (id < 0)
break; break;
int i = 0; int i = 0;
@ -1686,8 +1686,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
lyx::dispatch(FuncRequest(LFUN_REFERENCE_INSERT, arg)); lyx::dispatch(FuncRequest(LFUN_REFERENCE_INSERT, arg));
break; break;
} else { } else {
// if there is not a label yet, or we do not see it // if there is not a label yet
// (since it is in a different buffer),
// go to the paragraph (including nested insets) ... // go to the paragraph (including nested insets) ...
lyx::dispatch(FuncRequest(LFUN_BOOKMARK_SAVE, "0")); lyx::dispatch(FuncRequest(LFUN_BOOKMARK_SAVE, "0"));
for (string const & s : pids) { for (string const & s : pids) {
@ -1697,13 +1696,6 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
dit = b->getParFromID(id); dit = b->getParFromID(id);
lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_GOTO, s)); lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_GOTO, s));
} }
// ... and try again if we find a label ...
label = dit.innerParagraph().getLabelForXRef();
string arg;
if (!label.empty()) {
// if the paragraph has a label, we refer to this
arg = (type.empty()) ? label : label + " " + type;
} else {
// ... if not, insert a new label // ... if not, insert a new label
// we do not want to open the dialog, hence we // we do not want to open the dialog, hence we
// do not employ LFUN_LABEL_INSERT // do not employ LFUN_LABEL_INSERT
@ -1712,9 +1704,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
p["name"] = new_label; p["name"] = new_label;
string const data = InsetCommand::params2string(p); string const data = InsetCommand::params2string(p);
lyx::dispatch(FuncRequest(LFUN_INSET_INSERT, data)); lyx::dispatch(FuncRequest(LFUN_INSET_INSERT, data));
arg = (type.empty()) ? to_utf8(new_label) string const arg = (type.empty()) ? to_utf8(new_label)
: to_utf8(new_label) + " " + type; : to_utf8(new_label) + " " + type;
}
// ... and go back to the original position // ... and go back to the original position
lyx::dispatch(FuncRequest(LFUN_BOOKMARK_GOTO, "0")); lyx::dispatch(FuncRequest(LFUN_BOOKMARK_GOTO, "0"));
// ... to insert the ref // ... to insert the ref