fix bug 2089: Touching Navigate menu crashes Lyx when a TOC inset is in a section layout

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

src/ChangeLog

@@ -1,3 +1,7 @@
+2005-11-25  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* paragraph.C (asString): use new inset->textString method (fix bug 2089)
+
 2005-11-24  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* CutAndPaste.C (numberOfSelections): new helper function.

src/insets/ChangeLog

@@ -1,3 +1,15 @@
+2005-11-25  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* insetbase.h: 
+	* insetcharstyle.[Ch]:
+	* insetcite.[Ch]:
+	* insetlatexaccent.[Ch]:
+	* insetquotes.[Ch]:
+	* insetref.[Ch]:
+	* insetspace.[Ch]:
+	* insetspecialchar.[Ch]:
+	* inseturl.[Ch]: new method textString (fix bug 2089)
+
 2005-11-18  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* insetbibtex.C (latex): copy .bib files to the master buffer temp dir

src/insets/insetbase.h

@@ -191,6 +191,9 @@ public:
 	/// docbook output
 	virtual int docbook(Buffer const &, std::ostream & os,
 		OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, std::ostream &,
+		OutputParams const &) const { return 0; };
 
 	/** This enum indicates by which means the inset can be modified:
 	- NOT_EDITABLE: the inset's content can not be modified at all 

src/insets/insetcharstyle.C

@@ -316,6 +316,13 @@ int InsetCharStyle::plaintext(Buffer const & buf, ostream & os,
 }
 
 
+int InsetCharStyle::textString(Buffer const & buf, ostream & os,
+		       OutputParams const & op) const
+{
+	return plaintext(buf, os, op);
+}
+
+
 void InsetCharStyle::validate(LaTeXFeatures & features) const
 {
 	// Force inclusion of preamble snippet in layout file

src/insets/insetcharstyle.h

@@ -80,6 +80,9 @@ public:
 	///
 	int plaintext(Buffer const &, std::ostream &,
 		  OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, std::ostream & os,
+		OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures &) const;
 

src/insets/insetcite.C

@@ -353,6 +353,13 @@ int InsetCitation::docbook(Buffer const &, ostream & os, OutputParams const &) c
 }
 
 
+int InsetCitation::textString(Buffer const & buf, ostream & os,
+		       OutputParams const & op) const
+{
+	return plaintext(buf, os, op);
+}
+
+
 // Have to overwrite the default InsetCommand method in order to check that
 // the \cite command is valid. Eg, the user has natbib enabled, inputs some
 // citations and then changes his mind, turning natbib support off. The output

src/insets/insetcite.h

@@ -38,6 +38,9 @@ public:
 	///
 	int docbook(Buffer const &, std::ostream &,
 		  OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, std::ostream & os,
+		OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures &) const;
 

src/insets/insetlatexaccent.C

@@ -601,6 +601,13 @@ int InsetLatexAccent::docbook(Buffer const &, ostream & os,
 }
 
 
+int InsetLatexAccent::textString(Buffer const & buf, ostream & os,
+		       OutputParams const & op) const
+{
+	return plaintext(buf, os, op);
+}
+
+
 bool InsetLatexAccent::directWrite() const
 {
 	return true;

src/insets/insetlatexaccent.h

@@ -57,6 +57,9 @@ public:
 	///
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, std::ostream & os,
+		OutputParams const &) const;
 	///
 	bool directWrite() const;
 	///

src/insets/insetquotes.C

@@ -330,6 +330,13 @@ int InsetQuotes::docbook(Buffer const &, ostream & os,
 }
 
 
+int InsetQuotes::textString(Buffer const & buf, ostream & os,
+		       OutputParams const & op) const
+{
+	return plaintext(buf, os, op);
+}
+
+
 void InsetQuotes::validate(LaTeXFeatures & features) const
 {
 	bool const use_babel = features.useBabel();

src/insets/insetquotes.h

@@ -93,6 +93,11 @@ public:
 	///
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const &) const;
+
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, std::ostream & os,
+		OutputParams const &) const;
+
 	///
 	void validate(LaTeXFeatures &) const;
 	///

src/insets/insetref.C

@@ -127,6 +127,13 @@ int InsetRef::docbook(Buffer const & buf, ostream & os,
 }
 
 
+int InsetRef::textString(Buffer const & buf, ostream & os,
+		       OutputParams const & op) const
+{
+	return plaintext(buf, os, op);
+}
+
+
 void InsetRef::validate(LaTeXFeatures & features) const
 {
 	if (getCmdName() == "vref" || getCmdName() == "vpageref")

src/insets/insetref.h

@@ -55,6 +55,9 @@ public:
 	///
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, std::ostream & os,
+		OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures & features) const;
 protected:

src/insets/insetspace.C

@@ -254,6 +254,13 @@ int InsetSpace::docbook(Buffer const &, ostream & os,
 }
 
 
+int InsetSpace::textString(Buffer const & buf, ostream & os,
+		       OutputParams const & op) const
+{
+	return plaintext(buf, os, op);
+}
+
+
 auto_ptr<InsetBase> InsetSpace::doClone() const
 {
 	return auto_ptr<InsetBase>(new InsetSpace(kind_));

src/insets/insetspace.h

@@ -72,6 +72,9 @@ public:
 	///
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, std::ostream & os,
+		OutputParams const &) const;
 	///
 	InsetBase::Code lyxCode() const { return InsetBase::SPACE_CODE; }
 	/// We don't need \begin_inset and \end_inset

src/insets/insetspecialchar.C

@@ -243,6 +243,13 @@ int InsetSpecialChar::docbook(Buffer const &, ostream & os,
 }
 
 
+int InsetSpecialChar::textString(Buffer const & buf, ostream & os,
+		       OutputParams const & op) const
+{
+	return plaintext(buf, os, op);
+}
+
+
 auto_ptr<InsetBase> InsetSpecialChar::doClone() const
 {
 	return auto_ptr<InsetBase>(new InsetSpecialChar(kind_));

src/insets/insetspecialchar.h

@@ -64,6 +64,9 @@ public:
 	///
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, std::ostream & os,
+		OutputParams const &) const;
 	///
 	InsetBase::Code lyxCode() const { return InsetBase::SPECIALCHAR_CODE; }
 	/// We don't need \begin_inset and \end_inset

src/insets/inseturl.C

@@ -100,6 +100,13 @@ int InsetUrl::docbook(Buffer const &, ostream & os,
 }
 
 
+int InsetUrl::textString(Buffer const & buf, ostream & os,
+		       OutputParams const & op) const
+{
+	return plaintext(buf, os, op);
+}
+
+
 void InsetUrl::validate(LaTeXFeatures & features) const
 {
 	features.require("url");

src/insets/inseturl.h

@@ -46,6 +46,9 @@ public:
 	///
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, std::ostream & os,
+		OutputParams const &) const;
 private:
 	virtual std::auto_ptr<InsetBase> doClone() const {
 		return std::auto_ptr<InsetBase>(new InsetUrl(params()));

src/mathed/ChangeLog

@@ -1,3 +1,7 @@
+2005-11-25  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* math_hullinset.[Ch]: new method textString (fix bug 2089)
+
 2005-11-15  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* command_inset.[Ch] (editXY): implement, since MathNestInset::editXY

src/mathed/math_hullinset.C

@@ -1473,3 +1473,10 @@ int MathHullInset::docbook(Buffer const & buf, ostream & os,
 	ms << ETag(name.c_str());
 	return ms.line() + res;
 }
+
+
+int MathHullInset::textString(Buffer const & buf, ostream & os,
+		       OutputParams const & op) const
+{
+	return plaintext(buf, os, op);
+}

src/mathed/math_hullinset.h

@@ -108,6 +108,9 @@ public:
 	///
 	int docbook(Buffer const &, std::ostream &,
 		    OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, std::ostream & os,
+		OutputParams const &) const;
 
 	/// get notification when the cursor leaves this inset
 	void notifyCursorLeaves(LCursor & cur);

src/paragraph.C

@@ -1598,7 +1598,7 @@ string const Paragraph::asString(Buffer const & buffer,
 		if (IsPrintable(c))
 			os << c;
 		else if (c == META_INSET)
-			getInset(i)->plaintext(buffer, os, runparams);
+			getInset(i)->textString(buffer, os, runparams);
 	}
 
 	return os.str();