try this for distinguishing inner and outer tabs

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index 9e930036739cc95af88e9252b1b1b567e96fd0c5..78db842465f2e0fed954bab51ca97ab5dcd5890b 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -161,8 +161,6 @@ public:
     explicit
     LyXTabular(Buffer const *, InsetTabular *, LyXLex & lex);
     ///
-    ~LyXTabular();
-    ///
     LyXTabular & operator=(LyXTabular const &);
     ///
     LyXTabular * Clone(InsetTabular *);
@@ -368,6 +366,8 @@ public:
     ///
     InsetText * GetCellInset(int cell) const;
     ///
+    InsetText * GetCellInset(int row, int column) const;
+    ///
     int rows() const { return rows_; }
     ///
     int columns() const { return columns_;}
@@ -455,6 +455,12 @@ private: //////////////////////////////////////////////////////////////////
     ///
     typedef std::vector<columnstruct> column_vector;
 
+    ///
+    void ReadNew(Buffer const * buf, std::istream & is,
+            LyXLex & lex, string const & l);
+    ///
+    void ReadOld(Buffer const * buf, std::istream & is,
+            LyXLex & lex, string const & l);
     ///
     int rows_;
     ///
@@ -462,9 +468,9 @@ private: //////////////////////////////////////////////////////////////////
     ///
     int numberofcells;
     ///
-    int * rowofcell;
+    std::vector<int> rowofcell;
     ///
-    int * columnofcell;
+    std::vector<int> columnofcell;
     ///
     row_vector row_info;
     ///