anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-04 14:20:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify the logic a bit here.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23504 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-03-06 05:10:04 +00:00
parent 61e10d5c85
commit ac89b178de
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/frontends/qt4/GuiToolbar.cpp
View File

@ -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,17 +669,13 @@ 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) { theLyXFunc().setLyXView(&owner_);
FuncRequest const func(LFUN_LAYOUT, itname, lyx::dispatch(func);
FuncRequest::TOOLBAR); updateContents(false);
theLyXFunc().setLyXView(&owner_); resetFilter();
lyx::dispatch(func); return;
updateContents(false);
resetFilter();
return;
}
} }
lyxerr << "ERROR (layoutSelected): layout not found!" << endl; lyxerr << "ERROR (layoutSelected): layout not found!" << endl;
} }