* In the process of fixing the math background color bug, this commit transfer backgr...

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

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index 47fa58b77a6350313d87916ec894c17fe7915bb5..967838573272ea2b62dda2165837b3dcf626eb45 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -60,7 +60,7 @@ public:
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
+       bool metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -83,13 +83,13 @@ public:
        bool display() const { return tabular.isLongTabular(); }
        ///
        int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                 OutputParams const &) const;
        ///
        int plaintext(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+                   OutputParams const &) const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
@@ -117,6 +117,10 @@ public:
 
        /// set the change for the entire inset
        void setChange(Change const & change);
+       /// accept the changes within the inset
+       void acceptChanges(BufferParams const & bparams);
+       /// reject the changes within the inset
+       void rejectChanges(BufferParams const & bparams);
 
        // this should return true if we have a "normal" cell, otherwise false.
        // "normal" means without width set!
@@ -173,11 +177,9 @@ private:
        ///
        void removeTabularRow();
        ///
-       bool hasPasteBuffer() const;
-       ///
        bool copySelection(LCursor & cur);
        ///
-       bool pasteSelection(LCursor & cur);
+       bool pasteClipboard(LCursor & cur);
        ///
        void cutSelection(LCursor & cur);
        ///
@@ -186,7 +188,7 @@ private:
        void getSelection(LCursor & cur, row_type & rs, row_type & re,
                          col_type & cs, col_type & ce) const;
        ///
-       bool insertAsciiString(BufferView &, docstring const & buf, bool usePaste);
+       bool insertPlaintextString(BufferView &, docstring const & buf, bool usePaste);
        /// are we operating on several cells?
        bool tablemode(LCursor & cur) const;
 
@@ -201,6 +203,9 @@ private:
        mutable idx_type first_visible_cell;
        ///
        mutable int scx_;
+       /// Ugly boolean used when this inset is dissolved and
+       /// InsetTabularMailer should not be used.
+       bool is_deleted_;
 };