From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 11 Jan 2006 14:22:11 +0000 (+0000)
Subject: fix bug 2188
X-Git-Tag: 1.6.10~13702
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0711d8e04591deb3f069b2d62cf21b3580d64318;p=lyx.git

fix bug 2188


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

diff --git a/src/ChangeLog b/src/ChangeLog
index f9e76eaef7..052d0c1309 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-10  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* tabular.C (getLabelList): remove (not used anymore).
+
 2006-01-07  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* outputparams.[Ch]: add new flag inComment
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 092e271a4f..6190daeea7 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-10  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* insettext.C (getLabelList):
+	* insettabular.C (getLabelList): remove, since the ParIterator
+	already does the job of looking inside insets (bug 2188)
+
 2006-01-07  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* ExternalSupport.[Ch] (updateExternal): add external_in_comment flag
diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 4d7b3085fe..1b4af4926f 100644
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1689,13 +1689,6 @@ void InsetTabular::openLayoutDialog(BufferView * bv) const
 }
 
 
-void InsetTabular::getLabelList(Buffer const & buffer,
-				vector<string> & list) const
-{
-	tabular.getLabelList(buffer, list);
-}
-
-
 bool InsetTabular::copySelection(LCursor & cur)
 {
 	if (!cur.selection())
diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index 1088145ab6..3664c12ace 100644
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -103,8 +103,6 @@ public:
 	void openLayoutDialog(BufferView *) const;
 	///
 	bool showInsetDialog(BufferView *) const;
-	/// Appends \c list with all labels found within this inset.
-	void getLabelList(Buffer const &, std::vector<std::string> & list) const;
 	/// number of cells
 	size_t nargs() const { return tabular.getNumberOfCells(); }
 	///
diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 2b11b8ed8a..e01bc6a287 100644
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -323,20 +323,6 @@ bool InsetText::showInsetDialog(BufferView *) const
 }
 
 
-void InsetText::getLabelList(Buffer const & buffer,
-			     std::vector<string> & list) const
-{
-	ParagraphList::const_iterator pit = paragraphs().begin();
-	ParagraphList::const_iterator pend = paragraphs().end();
-	for (; pit != pend; ++pit) {
-		InsetList::const_iterator beg = pit->insetlist.begin();
-		InsetList::const_iterator end = pit->insetlist.end();
-		for (; beg != end; ++beg)
-			beg->inset->getLabelList(buffer, list);
-	}
-}
-
-
 void InsetText::markNew(bool track_changes)
 {
 	ParagraphList::iterator pit = paragraphs().begin();
diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 11cd54be75..ded29d1bc9 100644
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -97,8 +97,6 @@ public:
 	void setViewCache(BufferView const * bv) const;
 	///
 	bool showInsetDialog(BufferView *) const;
-	/// Appends \c list with all labels found within this inset.
-	void getLabelList(Buffer const &, std::vector<std::string> & list) const;
 	///
 	LyXText * getText(int i) const {
 		return (i == 0) ? const_cast<LyXText*>(&text_) : 0;
diff --git a/src/tabular.C b/src/tabular.C
index 10e8d938fc..212431cbb8 100644
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -2607,15 +2607,6 @@ void LyXTabular::validate(LaTeXFeatures & features) const
 }
 
 
-void LyXTabular::getLabelList(Buffer const & buffer,
-			      std::vector<string> & list) const
-{
-	for (row_type i = 0; i < rows_; ++i)
-		for (col_type j = 0; j < columns_; ++j)
-			getCellInset(i, j)->getLabelList(buffer, list);
-}
-
-
 LyXTabular::BoxType LyXTabular::useParbox(idx_type cell) const
 {
 	ParagraphList const & parlist = getCellInset(cell)->paragraphs();
diff --git a/src/tabular.h b/src/tabular.h
index 93358d4ab0..fc54679fa0 100644
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -397,8 +397,6 @@ public:
 	col_type columns() const { return columns_;}
 	///
 	void validate(LaTeXFeatures &) const;
-	/// Appends \c list with all labels found within this inset.
-	void getLabelList(Buffer const &, std::vector<std::string> & list) const;
 	///
 //private:
 	///