Implement proper pasting from multiple table cells to non-table (#4447)

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

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 641f78d95597836f86265a2f5203b8215467cf51..0e76bdd9aeb0465128c851eb9ba67ff690a790b0 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -44,7 +44,7 @@ class FuncStatus;
 class Lexer;
 class OutputParams;
 class Paragraph;
-class XHTMLStream;
+class XMLStream;
 
 
 ///
@@ -72,7 +72,7 @@ public:
        /// descending into insets
        docstring asString(bool intoInsets = true);
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void addToToc(DocIterator const & di, bool output_active,
                                  UpdateType utype, TocBackend & backend) const;
@@ -116,7 +116,7 @@ private:
        // FIXME: Here the thoughts from the comment above also apply.
        ///
        LyXAlignment contentAlign;
-       /// should paragraph indendation be omitted in any case?
+       /// should paragraph indentation be omitted in any case?
        bool neverIndent() const { return true; }
        ///
        LyXAlignment contentAlignment() const { return contentAlign; }
@@ -555,9 +555,13 @@ public:
        ///
        void insertColumn(col_type column, bool copy);
        ///
-       idx_type getFirstCellInRow(row_type row) const;
+       idx_type getFirstCellInRow(row_type row, bool const ct = false) const;
        ///
-       idx_type getLastCellInRow(row_type row) const;
+       idx_type getLastCellInRow(row_type row, bool const ct = false) const;
+       ///
+       idx_type getFirstRow(bool const ct = false) const;
+       ///
+       idx_type getLastRow(bool const ct = false) const;
        ///
        idx_type numberOfCellsInRow(row_type row) const;
        ///
@@ -569,7 +573,7 @@ public:
        ///
        int docbook(odocstream & os, OutputParams const &) const;
        ///
-       docstring xhtml(XHTMLStream & os, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void plaintext(odocstringstream &,
                       OutputParams const & runparams, int const depth,
@@ -869,21 +873,24 @@ public:
        ///
        // helper function for Latex
        ///
-       void TeXTopHLine(otexstream &, row_type row, std::list<col_type>) const;
+       void TeXTopHLine(otexstream &, row_type row, std::list<col_type>,
+                        std::list<col_type>) const;
        ///
-       void TeXBottomHLine(otexstream &, row_type row, std::list<col_type>) const;
+       void TeXBottomHLine(otexstream &, row_type row, std::list<col_type>,
+                           std::list<col_type>) const;
        ///
        void TeXCellPreamble(otexstream &, idx_type cell, bool & ismulticol, bool & ismultirow,
                             bool const bidi) const;
        ///
        void TeXCellPostamble(otexstream &, idx_type cell, bool ismulticol, bool ismultirow) const;
        ///
-       void TeXLongtableHeaderFooter(otexstream &, OutputParams const &, std::list<col_type>) const;
+       void TeXLongtableHeaderFooter(otexstream &, OutputParams const &, std::list<col_type>,
+                                     std::list<col_type>) const;
        ///
        bool isValidRow(row_type const row) const;
        ///
        void TeXRow(otexstream &, row_type const row,
-                   OutputParams const &, std::list<col_type>) const;
+                   OutputParams const &, std::list<col_type>, std::list<col_type>) const;
        ///
        // helper functions for plain text
        ///
@@ -901,7 +908,7 @@ public:
        /// auxiliary function for docbook
        int docbookRow(odocstream & os, row_type, OutputParams const &) const;
        ///
-       docstring xhtmlRow(XHTMLStream & xs, row_type, OutputParams const &,
+       docstring xhtmlRow(XMLStream & xs, row_type, OutputParams const &,
                           bool header = false) const;
 
        /// change associated Buffer
@@ -956,7 +963,7 @@ public:
        bool canTrackChanges() const { return true; }
        ///
        bool canPaintChange(BufferView const &) const { return true; }
-       /** returns false if, when outputing LaTeX, font changes should
+       /** returns false if, when outputting LaTeX, font changes should
            be closed before generating this inset. This is needed for
            insets that may contain several paragraphs */
        bool inheritFont() const { return false; }
@@ -965,7 +972,7 @@ public:
        //
        bool isTable() const { return true; }
        ///
-       DisplayType display() const;
+       RowFlags rowFlags() const;
        ///
        void latex(otexstream &, OutputParams const &) const;
        ///
@@ -974,7 +981,7 @@ public:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
@@ -1030,7 +1037,7 @@ public:
        /// can we go further down on mouse click?
        bool descendable(BufferView const &) const { return true; }
        /// Update the counters of this inset and of its contents
-       void updateBuffer(ParIterator const &, UpdateType);
+       void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false);
        ///
        void addToToc(DocIterator const & di, bool output_active,
                                  UpdateType utype, TocBackend & backend) const;
@@ -1068,6 +1075,8 @@ public:
        /// writes the cells between stidx and enidx as a string, optionally
        /// descending into the insets
        docstring asString(idx_type stidx, idx_type enidx, bool intoInsets = true);
+       ///
+       ParagraphList asParList(idx_type stidx, idx_type enidx);
 
        /// Returns whether the cell in the specified row and column is selected.
        bool isCellSelected(Cursor & cur, row_type row, col_type col) const;