From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 15 Mar 2006 15:07:20 +0000 (+0000)
Subject: make sure we clear menu contents before expand()
X-Git-Tag: 1.6.10~13507
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d300f93cec401978aa49fd2f17541fe0de1c29fb;p=lyx.git

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 9f9f42cc3b..b40100846c 100644
--- 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 8ecdb4bad1..44789444a7 100644
--- 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 20e34f0fde..d93101bb02 100644
--- 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(); }
 	///