clone NVI, other small stuff

[lyx.git] / src / tabular.h

diff --git a/src/tabular.h b/src/tabular.h
index ad2818fc890180f5b12e894d999276b9cb4b65d1..62de87e810e8818f7315327bf58d0e52f9569b3a 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -18,6 +18,8 @@
 #include "lyxlength.h"
 #include "insets/insettext.h"
 
+#include <boost/shared_ptr.hpp>
+
 #include <iosfwd>
 #include <vector>
 
@@ -172,8 +174,6 @@ public:
 
        /// constructor
        LyXTabular(BufferParams const &, int columns_arg, int rows_arg);
-       ///
-       void setOwner(InsetTabular * inset);
 
        /// Returns true if there is a topline, returns false if not
        bool topLine(int cell, bool onlycolumn = false) const;
@@ -207,11 +207,11 @@ public:
        int getDescentOfRow(int row) const;
        ///
        int getHeightOfTabular() const;
-       /// Returns true if a complete update is necessary, otherwise false
+       ///
        void setAscentOfRow(int row, int height);
-       /// Returns true if a complete update is necessary, otherwise false
+       ///
        void setDescentOfRow(int row, int height);
-       /// Returns true if a complete update is necessary, otherwise false
+       ///
        void setWidthOfCell(int cell, int new_width);
        ///
        void setAllLines(int cell, bool line);
@@ -366,12 +366,12 @@ public:
        ///
        // end longtable support
        ///
-       InsetText & getCellInset(int cell) const;
+       boost::shared_ptr<InsetText> getCellInset(int cell) const;
        ///
-       InsetText & getCellInset(int row, int column) const;
+       boost::shared_ptr<InsetText> getCellInset(int row, int column) const;
        /// Search for \param inset in the tabular, with the
        ///
-       int getCellFromInset(InsetOld const * inset) const;
+       int getCellFromInset(InsetBase const * inset) const;
        ///
        int rows() const { return rows_; }
        ///
@@ -387,6 +387,12 @@ public:
                ///
                cellstruct(BufferParams const &);
                ///
+               cellstruct(cellstruct const &);
+               ///
+               cellstruct & operator=(cellstruct);
+               ///
+               void swap(cellstruct & rhs);
+               ///
                int cellno;
                ///
                int width_of_cell;
@@ -413,7 +419,7 @@ public:
                ///
                LyXLength p_width; // this is only set for multicolumn!!!
                ///
-               InsetText inset;
+               boost::shared_ptr<InsetText> inset;
        };
        cellstruct & cellinfo_of_cell(int cell) const;
        ///