X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.h;h=5fcc892dba96cd2a8417f806434e4ad5f9afc708;hb=d044d6afa7192b2119784e1415e71dad644bc335;hp=a79ce38ac2ed54d164ab81c743403abc208fd8f3;hpb=ecef54500d4d77baf4fa47eac2253679875ac08c;p=lyx.git

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index a79ce38ac2..5fcc892dba 100644
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -108,8 +108,6 @@ public:
 
 	/// change associated Buffer
 	virtual void setBuffer(Buffer & buffer);
-	/// remove the buffer reference
-	void resetBuffer() { setBuffer( *static_cast<Buffer *>(0)); }
 	/// retrieve associated Buffer
 	virtual Buffer & buffer();
 	virtual Buffer const & buffer() const;
@@ -127,7 +125,7 @@ public:
 	  * Intented purpose is to sanitize internal state with regard to current
 	  * Buffer. 
 	  **/
-	virtual void initView() {};
+	virtual void initView() {}
 	/// \return true if this inset is labeled.
 	virtual bool isLabeled() const { return false; }
 
@@ -263,10 +261,6 @@ public:
 	virtual row_type row(idx_type) const { return 0; }
 	/// cell index corresponding to row and column;
 	virtual idx_type index(row_type row, col_type col) const;
-	/// any additional x-offset when drawing a cell?
-	virtual int cellXOffset(idx_type) const { return 0; }
-	/// any additional y-offset when drawing a cell?
-	virtual int cellYOffset(idx_type) const { return 0; }
 	/// number of embedded cells
 	virtual size_t nargs() const { return 0; }
 	/// number of rows in gridlike structures
@@ -333,7 +327,7 @@ public:
 	virtual void toString(odocstream &) const {}
 	/// Appends a potentially abbreviated version of the inset to
 	/// \param str. Intended for use by the TOC.
-	virtual void forToc(docstring & str,
+	virtual void forOutliner(docstring & str,
 	                    size_t maxlen = TOC_ENTRY_LENGTH) const;
 
 	/// can the contents of the inset be edited on screen ?
@@ -351,7 +345,7 @@ public:
 	/// can we click at the specified position ?
 	virtual bool clickable(int, int) const { return false; }
 	/// Move one cell backwards
-	virtual bool allowsCaptionVariation() const { return false; }
+	virtual bool allowsCaptionVariation(std::string const &) const { return false; }
 
 	/// does this contain text that can be change track marked in DVI?
 	virtual bool canTrackChanges() const { return false; }
@@ -437,8 +431,8 @@ public:
 	/// is this equivalent to a space (which is BTW different from
 	/// a line separator)?
 	virtual bool isSpace() const { return false; }
-	/// is this an expandible space (rubber length)?
-	virtual bool isStretchableSpace() const { return false; }
+	/// does this inset try to use all available space (like \\hfill does)?
+	virtual bool isHfill() const { return false; }
 
 	enum DisplayType {
 		Inline = 0,
@@ -496,7 +490,7 @@ public:
 	/// Add an entry to the TocList
 	/// Pass a DocIterator that points at the paragraph containing
 	/// the inset
-	virtual void addToToc(DocIterator const &) const {}
+	virtual void addToToc(DocIterator const & /* di */, bool /* output_active */) const {}
 	/// Collect BibTeX information
 	virtual void collectBibKeys(InsetIterator const &) const {}
 	/// Update the counters of this inset and of its contents.
@@ -534,17 +528,18 @@ public:
 	/**
 	 * If this method returns true all explicitly set font attributes
 	 * are reset during editing operations.
-	 * For copy/paste the operations the language is never changed, since
+	 * For copy/paste operations the language is never changed, since
 	 * the language of a given text never changes if the text is
 	 * formatted differently, while other font attribues like size may
 	 * need to change if the text is copied from one environment to
 	 * another one.
-	 * If it returns false no font attribute is reset.
-	 * The default implementation returns the negation of inheritFont(),
+	 * If this method returns false no font attribute is reset.
+	 * The default implementation returns true if the resetFont layout
+	 * tag is set and otherwise the negation of inheritFont(),
 	 * since inherited inset font attributes do not need to be changed,
 	 * and non-inherited ones need to be set explicitly.
 	 */
-	virtual bool resetFontEdit() const { return !inheritFont(); }
+	virtual bool resetFontEdit() const;
 
 	/// set the change for the entire inset
 	virtual void setChange(Change const &) {}