anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-13 06:20:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug http://bugzilla.lyx.org/show_bug.cgi?id=4621

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23630 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2008-03-10 13:42:16 +00:00
parent ac5c584bc2
commit 47076b9dbb
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/frontends/qt4/Menus.cpp
View File

@ -573,8 +573,15 @@ bool MenuDefinition::searchMenu(FuncRequest const & func, vector<docstring> & na
} }
if (m->kind() == MenuItem::Submenu) { if (m->kind() == MenuItem::Submenu) {
names.push_back(qstring_to_ucs4(m->label())); names.push_back(qstring_to_ucs4(m->label()));
MenuDefinition const & submenu = *m->submenu(); MenuDefinition const * submenu = m->submenu();
if (submenu.searchMenu(func, names)) if (!submenu) {
LYXERR(Debug::GUI, "Warning: non existing sub menu label="
<< fromqstr(m->label())
<< " name=" << fromqstr(m->submenuname()));
names.pop_back();
continue;
}
if (submenu->searchMenu(func, names))
return true; return true;
names.pop_back(); names.pop_back();
} }
@ -1418,7 +1425,9 @@ void Menus::read(Lexer & lex)
bool Menus::searchMenu(FuncRequest const & func, bool Menus::searchMenu(FuncRequest const & func,
vector<docstring> & names) const vector<docstring> & names) const
{ {
return d->menubar_.searchMenu(func, names); MenuDefinition menu;
d->expand(d->menubar_, menu, 0);
return menu.searchMenu(func, names);
} }