Pure HTML output for math macros.

[lyx.git] / src / insets / InsetTabular.h

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 6a1bd18e1f516ba058da7ff3f2add76792d15f00..9e3f532f390b70d7ff8e218ae27f041b28c90ed5 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -282,12 +282,16 @@ public:
        ///
        int columnWidth(idx_type cell) const;
        ///
-       int rowHeight(idx_type cell) const;
+       int cellHeight(idx_type cell) const;
        ///
        int width() const;
        ///
        int height() const;
        ///
+       row_type nrows() const {return row_info.size();}
+       ///
+       col_type ncols() const {return column_info.size();}
+       ///
        int rowAscent(row_type row) const;
        ///
        int rowDescent(row_type row) const;
@@ -375,9 +379,7 @@ public:
        ///
        bool isMultiColumn(idx_type cell) const;
        ///
-       bool isMultiColumnReal(idx_type cell) const;
-       ///
-       void setMultiColumn(idx_type cell, idx_type number);
+       idx_type setMultiColumn(idx_type cell, idx_type number);
        ///
        void unsetMultiColumn(idx_type cell);
        ///
@@ -387,7 +389,7 @@ public:
        ///
        bool isMultiRow(idx_type cell) const;
        ///
-       void setMultiRow(idx_type cell, idx_type number);
+       idx_type setMultiRow(idx_type cell, idx_type number);
        ///
        void unsetMultiRow(idx_type cell);
        ///
@@ -395,8 +397,6 @@ public:
        ///
        col_type cellColumn(idx_type cell) const;
        ///
-       col_type cellRightColumn(idx_type cell) const;
-       ///
        void setRotateCell(idx_type cell, bool);
        ///
        bool getRotateCell(idx_type cell) const;
@@ -491,6 +491,8 @@ public:
                ///
                VAlignment valignment;
                ///
+               int voffset;
+               ///
                bool top_line;
                ///
                bool bottom_line;
@@ -910,8 +912,6 @@ private:
        ///
        void resetPos(Cursor & cur) const;
        ///
-       void removeTabularRow();
-       ///
        bool copySelection(Cursor & cur);
        ///
        bool pasteClipboard(Cursor & cur);