X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular.h;h=0033e28511c79dd27a57fa3fb8a963ec5aec1352;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=eae41187fe7b08e99d3fa19fd4b3527196bfaff5;hpb=d6ed22a813c0d0c0695fcb31e1ddf772029ca32f;p=lyx.git

diff --git a/src/tabular.h b/src/tabular.h
index eae41187fe..0033e28511 100644
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -57,7 +57,7 @@ public:
 		///
 		VALIGN_BOTTOM,
 		///
-		VALIGN_CENTER,
+		VALIGN_MIDDLE,
 		///
 		M_TOGGLE_LINE_TOP,
 		///
@@ -77,7 +77,7 @@ public:
 		///
 		M_VALIGN_BOTTOM,
 		///
-		M_VALIGN_CENTER,
+		M_VALIGN_MIDDLE,
 		///
 		MULTICOLUMN,
 		///
@@ -140,7 +140,7 @@ public:
 		///
 		LYX_VALIGN_BOTTOM = 1,
 		///
-		LYX_VALIGN_CENTER = 2
+		LYX_VALIGN_MIDDLE = 2
 	};
 
 	enum BoxType {
@@ -210,11 +210,11 @@ public:
 	///
 	int getHeightOfTabular() const;
 	/// Returns true if a complete update is necessary, otherwise false
-	bool setAscentOfRow(int row, int height);
+	void setAscentOfRow(int row, int height);
 	/// Returns true if a complete update is necessary, otherwise false
-	bool setDescentOfRow(int row, int height);
+	void setDescentOfRow(int row, int height);
 	/// Returns true if a complete update is necessary, otherwise false
-	bool setWidthOfCell(int cell, int new_width);
+	void setWidthOfCell(int cell, int new_width);
 	///
 	void setAllLines(int cell, bool line);
 	///
@@ -225,10 +225,10 @@ public:
 	void setLeftLine(int cell, bool line, bool onlycolumn = false);
 	///
 	void setRightLine(int cell, bool line, bool onlycolumn = false);
-	/// 
+	///
 	void setAlignment(int cell, LyXAlignment align,
 			  bool onlycolumn = false);
-	/// 
+	///
 	void setVAlignment(int cell, VAlignment align,
 			   bool onlycolumn = false);
 	///
@@ -280,6 +280,8 @@ public:
 	///
 	int latex(Buffer const *, std::ostream &,
 		  LatexRunParams const &) const;
+	//
+	int linuxdoc(Buffer const * buf, std::ostream & os) const;
 	///
 	int docbook(Buffer const * buf, std::ostream & os, bool mixcont) const;
 	///
@@ -365,7 +367,7 @@ public:
 	InsetText & getCellInset(int row, int column) const;
 	/// Search for \param inset in the tabular, with the
 	/// additional hint that it could be at \param maybe_cell
-	int getCellFromInset(Inset const * inset, int maybe_cell = -1) const;
+	int getCellFromInset(InsetOld const * inset, int maybe_cell = -1) const;
 	///
 	int rows() const { return rows_; }
 	///