make sure we clear menu contents before expand()

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13379 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f9f42cc3b8b7ed889379fe58d2a612a16f948de..b40100846ceb997a4f3ae86c51d9d5ffd18c7916 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-15  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * MenuBackend.C (expand): make sure the menu is empty before
+       starting. 
+
+       * MenuBackend.h (clear): new method.
+
 2006-03-13  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * rowpainter.C (paintChangeBar): fix painting of change bar with

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 8ecdb4bad1394f0d52031fe6617d8016f4430e85..44789444a7a4f86d2d8a0207afad0e88bd8e62da 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -764,6 +764,9 @@ void expandBranches(Menu & tomenu, LyXView const * view)
 void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
                         LyXView const * view) const
 {
+       if (!tomenu.empty())
+               tomenu.clear();
+
        for (Menu::const_iterator cit = frommenu.begin();
             cit != frommenu.end() ; ++cit) {
                switch (cit->kind()) {

diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index 20e34f0fde06aa0a828ad01d721ce0dfab8897a1..d93101bb02f3cd114a5cb0128ef8bda78932b475 100644 (file)
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -153,6 +153,8 @@ public:
        std::string const & name() const { return name_; }
        ///
        bool empty() const { return items_.empty(); }
+       /// Clear the menu content.
+       void clear() { items_.clear(); }
        ///
        ItemList::size_type size() const { return items_.size(); }
        ///