[LyX/master] Menus: Factor Toc code

[Guillaume Munch]

commit 089b80fc7d039f1ddc7a9e38aace77d1b3351f43
Author: Guillaume Munch <g...@lyx.org>
Date:   Mon Nov 30 15:27:43 2015 +0000

    Menus: Factor Toc code
---
 src/frontends/qt4/Menus.cpp |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index c442b9b..22ef06b 100644
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -351,6 +351,7 @@ public:
        void expandFloatListInsert(Buffer const * buf);
        void expandFloatInsert(Buffer const * buf);
        void expandFlexInsert(Buffer const * buf, InsetLayout::InsetLyXType 
type);
+       void expandTocSubmenu(std::string const & type, Toc const & toc_list);
        void expandToc2(Toc const & toc_list, size_t from, size_t to, int 
depth, string toc_type);
        void expandToc(Buffer const * buf);
        void expandPasteRecent(Buffer const * buf);
@@ -1318,12 +1319,7 @@ void MenuDefinition::expandToc(Buffer const * buf)
                if (cit->first == "tableofcontents" || cit->second->empty())
                        continue;
                MenuDefinition submenu;
-               // "Open outliner..." entry
-               FuncRequest f(LFUN_DIALOG_SHOW, "toc " + cit->first);
-               submenu.add(MenuItem(MenuItem::Command, qt_("Open 
Outliner..."), f));
-               submenu.add(MenuItem(MenuItem::Separator));
-               // add entries
-               submenu.expandToc2(*cit->second, 0, cit->second->size(), 0, 
cit->first);
+               submenu.expandTocSubmenu(cit->first, *cit->second);
                MenuItem item(MenuItem::Submenu, guiName(cit->first, 
buf->params()));
                item.setSubmenu(submenu);
                // deserves to be in the main menu?
@@ -1352,6 +1348,17 @@ void MenuDefinition::expandToc(Buffer const * buf)
 }
 
 
+void MenuDefinition::expandTocSubmenu(std::string const & type, Toc const & 
toc)
+{
+       // "Open outliner..." entry
+       FuncRequest f(LFUN_DIALOG_SHOW, "toc " + type);
+       add(MenuItem(MenuItem::Command, qt_("Open Outliner..."), f));
+       add(MenuItem(MenuItem::Separator));
+       // add entries
+       expandToc2(toc, 0, toc.size(), 0, type);
+}
+
+
 void MenuDefinition::expandPasteRecent(Buffer const * buf)
 {
        docstring_list const sel = cap::availableSelections(buf);