Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index 241a8fe43e5d4eef2f7c4cabcc689b67c1525ee4..b95a38d280da5834ac5624209ae968f7702327f3 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -161,20 +161,18 @@ public:
     explicit
     LyXTabular(Buffer const *, InsetTabular *, LyXLex & lex);
     ///
-    ~LyXTabular();
-    ///
     LyXTabular & operator=(LyXTabular const &);
     ///
     LyXTabular * Clone(InsetTabular *);
     
     /// Returns true if there is a topline, returns false if not
-    bool TopLine(int cell, bool onlycolumn=false) const;
+    bool TopLine(int cell, bool onlycolumn = false) const;
     /// Returns true if there is a topline, returns false if not
-    bool BottomLine(int cell, bool onlycolumn=false) const;
+    bool BottomLine(int cell, bool onlycolumn = false) const;
     /// Returns true if there is a topline, returns false if not
-    bool LeftLine(int cell, bool onlycolumn=false) const;
+    bool LeftLine(int cell, bool onlycolumn = false) const;
     /// Returns true if there is a topline, returns false if not
-    bool RightLine(int cell, bool onlycolumn=false) const;
+    bool RightLine(int cell, bool onlycolumn = false) const;
     
     ///
     bool TopAlreadyDrawed(int cell) const;
@@ -280,6 +278,8 @@ public:
     ///
     int Latex(Buffer const *, std::ostream &, bool, bool) const;
     ///
+    int DocBook(Buffer const * buf, std::ostream & os) const;
+    ///
     // helper function for Latex returns number of newlines
     ///
     int AsciiTopHLine(std::ostream &, int row,
@@ -292,15 +292,6 @@ public:
                       int column, std::vector<unsigned int> const &) const;
     ///
     int Ascii(Buffer const *, std::ostream &) const;
-    ///
-    int DocBookEndOfCell(std::ostream &, int cell, int & depth) const;
-#if 0
-    ///
-    int RoffEndOfCell(std::ostream &, int cell);
-#endif
-    ///
-    string const  GetDocBookAlign(int cell, bool isColumn = false) const;
-
     ///
     bool IsMultiColumn(int cell, bool real = false) const;
     ///
@@ -366,6 +357,8 @@ public:
     ///
     InsetText * GetCellInset(int cell) const;
     ///
+    InsetText * GetCellInset(int row, int column) const;
+    ///
     int rows() const { return rows_; }
     ///
     int columns() const { return columns_;}
@@ -453,6 +446,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_;
     ///
@@ -460,9 +459,9 @@ private: //////////////////////////////////////////////////////////////////
     ///
     int numberofcells;
     ///
-    int * rowofcell;
+    std::vector<int> rowofcell;
     ///
-    int * columnofcell;
+    std::vector<int> columnofcell;
     ///
     row_vector row_info;
     ///
@@ -493,7 +492,7 @@ private: //////////////////////////////////////////////////////////////////
     ///
     void Reinit();
     ///
-    void set_row_column_number_info(bool oldformat=false);
+    void set_row_column_number_info(bool oldformat = false);
     /// Returns true if a complete update is necessary, otherwise false
     bool SetWidthOfMulticolCell(int cell, int new_width);
     ///