ws changes only

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index 7e873ae75a2ace290ac8faf5b62d4cdf23e88e13..2775ad6d27822e7565bf271be69cbba32c757e02 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -234,7 +234,7 @@ public:
        ///
        bool setMColumnPWidth(int cell, LyXLength const & width);
        ///
-       void setAlignSpecial(int cell, string const & special, Feature what);
+       void setAlignSpecial(int cell, std::string const & special, Feature what);
        ///
        LyXAlignment getAlignment(int cell, bool onlycolumn = false) const;
        ///
@@ -246,7 +246,7 @@ public:
        ///
        LyXLength const getMColumnPWidth(int cell) const;
        ///
-       string const getAlignSpecial(int cell, int what) const;
+       std::string const getAlignSpecial(int cell, int what) const;
        ///
        int getWidthOfCell(int cell) const;
        ///
@@ -375,7 +375,7 @@ public:
        ///
        void validate(LaTeXFeatures &) const;
        /// Appends \c list with all labels found within this inset.
-       void getLabelList(Buffer const &, std::vector<string> & list) const;
+       void getLabelList(Buffer const &, std::vector<std::string> & list) const;
        ///
 //private:
        ///
@@ -405,7 +405,7 @@ public:
                ///
                bool rotate;
                ///
-               string align_special;
+               std::string align_special;
                ///
                LyXLength p_width; // this is only set for multicolumn!!!
                ///
@@ -461,7 +461,7 @@ public:
                ///
                LyXLength p_width;
                ///
-               string align_special;
+               std::string align_special;
        };
        ///
        typedef std::vector<columnstruct> column_vector;
@@ -502,7 +502,7 @@ public:
        ///
        void init(BufferParams const &, int rows_arg, int columns_arg);
        ///
-       void set_row_column_number_info(bool oldformat = false);
+       void set_row_column_number_info();
        /// Returns true if a complete update is necessary, otherwise false
        bool setWidthOfMulticolCell(int cell, int new_width);
        ///
@@ -554,6 +554,10 @@ public:
                                           bool onlydata) const;
        /// auxiliary function for docbook
        int docbookRow(Buffer const & buf, std::ostream & os, int row) const;
+
+private:
+       /// renumber cells after structural changes
+       void fixCellNums();
 };
 
 #endif