X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular.h;h=fc54679fa0d0d04dc008cc195b97255d4733d22c;hb=6c2e78e12855d8661eb289ded3dc8722748863b8;hp=46223de2d4769e1febcb748666c37cd51514ba65;hpb=742ffb30325d81fe4517ef86aa3f0073a7f68270;p=lyx.git

diff --git a/src/tabular.h b/src/tabular.h
index 46223de2d4..fc54679fa0 100644
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -24,6 +24,7 @@
 #include <vector>
 
 class InsetTabular;
+class LCursor;
 class OutputParams;
 
 /* The features the text class offers for tables */
@@ -157,7 +158,8 @@ public:
 		BOX_MINIPAGE = 2
 	};
 
-	struct ltType {
+	class ltType {
+	public:
 		// constructor
 		ltType();
 		// we have this header type (is set in the getLT... functions)
@@ -240,9 +242,9 @@ public:
 	void setVAlignment(idx_type cell, VAlignment align,
 			   bool onlycolumn = false);
 	///
-	void setColumnPWidth(idx_type cell, LyXLength const & width);
+	void setColumnPWidth(LCursor &, idx_type, LyXLength const &);
 	///
-	bool setMColumnPWidth(idx_type cell, LyXLength const & width);
+	bool setMColumnPWidth(LCursor &, idx_type, LyXLength const &);
 	///
 	void setAlignSpecial(idx_type cell, std::string const & special,
 	                     Feature what);
@@ -383,6 +385,9 @@ public:
 	///
 	boost::shared_ptr<InsetText> getCellInset(row_type row,
 	                                          col_type column) const;
+	///
+	void setCellInset(row_type row, col_type column,
+			  boost::shared_ptr<InsetText>) const;
 	/// Search for \param inset in the tabular, with the
 	///
 	idx_type getCellFromInset(InsetBase const * inset) const;
@@ -392,12 +397,11 @@ 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:
 	///
-	struct cellstruct {
+	class cellstruct {
+	public:
 		///
 		cellstruct(BufferParams const &);
 		///
@@ -442,7 +446,8 @@ public:
 	typedef std::vector<cell_vector> cell_vvector;
 
 	///
-	struct rowstruct {
+	class rowstruct {
+	public:
 		///
 		rowstruct();
 		///
@@ -469,7 +474,8 @@ public:
 	typedef std::vector<rowstruct> row_vector;
 
 	///
-	struct columnstruct {
+	class columnstruct {
+		public:
 		///
 		columnstruct();
 		///