code cosmetics to the iterator fix

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index b2eb7ba10d3972215c88bac93894a1a0a8eb3bc4..8ecdb4bad1394f0d52031fe6617d8016f4430e85 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -517,6 +517,11 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view)
                        else if ((*fit)->name() == "textparagraph")
                                label = _("Plain Text as Paragraphs");
                        label += "...";
+               } else if (kind == MenuItem::ExportFormats) {
+                       // exporting to LyX does not make sense
+                       // FIXME: Introduce noexport flag
+                       if ((*fit)->name() == "lyx")
+                               continue;
                }
                if (!(*fit)->shortcut().empty())
                        label += '|' + (*fit)->shortcut();
@@ -737,10 +742,10 @@ void expandBranches(Menu & tomenu, LyXView const * view)
        if (!view || !view->buffer())
                return;
 
-       BufferParams const & params = view->buffer()->params();
+       BufferParams const & params = view->buffer()->getMasterBuffer()->params();
 
-       std::list<Branch>::const_iterator cit = params.branchlist().begin();
-       std::list<Branch>::const_iterator end = params.branchlist().end();
+       BranchList::const_iterator cit = params.branchlist().begin();
+       BranchList::const_iterator end = params.branchlist().end();
 
        for (int ii = 1; cit != end; ++cit, ++ii) {
                string label = cit->getBranch();