lyxstring compile fixes ; small stuff

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index 4910024086439589465bd14485e5d2cdd5c27adb..810037f9853463ca52404082cadbc2aa62b7fb96 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -4,7 +4,7 @@
  * 
  *           LyX, The Document Processor
  *      
- *           Copyright 2000 The LyX Team.
+ *           Copyright 2000-2001 The LyX Team.
  *
  *           @author: Jürgen Vigna
  *
@@ -163,7 +163,7 @@ public:
        ///
        LyXTabular & operator=(LyXTabular const &);
        ///
-       LyXTabular * Clone(InsetTabular *);
+       LyXTabular * clone(InsetTabular *);
        
        /// Returns true if there is a topline, returns false if not
        bool TopLine(int cell, bool onlycolumn = false) const;
@@ -182,8 +182,7 @@ public:
        bool IsLastRow(int cell) const;
 
        ///
-       int GetAdditionalHeight(int cell) const;
-
+       int GetAdditionalHeight(int row) const;
        ///
        int GetAdditionalWidth(int cell) const;
        
@@ -372,6 +371,8 @@ public:
        void Validate(LaTeXFeatures &) const;
        ///
        std::vector<string> const getLabelList() const;
+       ///
+       mutable int cur_cell;
 private:
        ///
        struct cellstruct {
@@ -493,7 +494,7 @@ private:
        InsetTabular * owner_;
 
        ///
-       void Init(int columns_arg, int rows_arg);
+       void Init(int columns_arg, int rows_arg, LyXTabular const * lt = 0);
        ///
        void Reinit();
        ///