mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-04 14:20:05 +00:00
Simplify the logic a bit here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23504 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
61e10d5c85
commit
ac89b178de
@ -657,7 +657,8 @@ void GuiLayoutBox::selected(int index)
|
|||||||
{
|
{
|
||||||
// get selection
|
// get selection
|
||||||
QModelIndex mindex = filterModel_->mapToSource(filterModel_->index(index, 1));
|
QModelIndex mindex = filterModel_->mapToSource(filterModel_->index(index, 1));
|
||||||
docstring const name = qstring_to_ucs4(model_->itemFromIndex(mindex)->text());
|
docstring const layoutName =
|
||||||
|
qstring_to_ucs4(model_->itemFromIndex(mindex)->text());
|
||||||
|
|
||||||
owner_.setFocus();
|
owner_.setFocus();
|
||||||
|
|
||||||
@ -668,18 +669,14 @@ void GuiLayoutBox::selected(int index)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// find corresponding text class
|
// find corresponding text class
|
||||||
for (size_t i = 0; i != text_class_->layoutCount(); ++i) {
|
if (text_class_->hasLayout(layoutName)) {
|
||||||
docstring const & itname = text_class_->layout(i)->name();
|
FuncRequest const func(LFUN_LAYOUT, layoutName, FuncRequest::TOOLBAR);
|
||||||
if (itname == name) {
|
|
||||||
FuncRequest const func(LFUN_LAYOUT, itname,
|
|
||||||
FuncRequest::TOOLBAR);
|
|
||||||
theLyXFunc().setLyXView(&owner_);
|
theLyXFunc().setLyXView(&owner_);
|
||||||
lyx::dispatch(func);
|
lyx::dispatch(func);
|
||||||
updateContents(false);
|
updateContents(false);
|
||||||
resetFilter();
|
resetFilter();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
lyxerr << "ERROR (layoutSelected): layout not found!" << endl;
|
lyxerr << "ERROR (layoutSelected): layout not found!" << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user