Completion: handle undo in insets' insertCompletion methods

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

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 6896323b4a3e7b2b5d4f40166d330ebe2e4aeed2..fcf4c2100f7d07d3dc914eaeb5d39dadf8e7f3f8 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -702,7 +702,7 @@ public:
        /// can return different things. this is because cellIndex(r,c)
        /// returns the VISIBLE cell at r,c, which may be the same as the
        /// cell at the previous row or column, if we're dealing with some
-       /// multirow or multicell.
+       /// multirow or multicolumn.
        std::shared_ptr<InsetTableCell> cellInset(idx_type cell);
        std::shared_ptr<InsetTableCell> cellInset(row_type row, col_type column);
        InsetTableCell const * cellInset(idx_type cell) const;
@@ -919,40 +919,10 @@ public:
        ///
        BoxType useBox(idx_type cell) const;
        ///
-       // helper function for Latex
-       ///
-       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>,
-                           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>,
-                                     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>, std::list<col_type>) const;
-       ///
-       // helper functions for plain text
-       ///
-       bool plaintextTopHLine(odocstringstream &, row_type row,
-                              std::vector<unsigned int> const &) const;
-       ///
-       bool plaintextBottomHLine(odocstringstream &, row_type row,
-                                 std::vector<unsigned int> const &) const;
-       ///
-       void plaintextPrintCell(odocstringstream &,
-                               OutputParams const &,
-                               idx_type cell, row_type row, col_type column,
-                               std::vector<unsigned int> const &,
-                               bool onlydata, size_t max_length) const;
 
        /// change associated Buffer
        void setBuffer(Buffer & buffer);
@@ -964,6 +934,9 @@ public:
 private:
        Buffer * buffer_;
 
+       ///
+       // helper function for DocBook
+       ///
        /// Determines whether the tabular item should be generated as DocBook or XHTML.
        enum class XmlOutputFormat : bool {
                XHTML = true,
@@ -985,6 +958,38 @@ private:
        XmlRowWiseBorders computeXmlBorders(row_type row) const;
        std::vector<std::string> computeCssStylePerCell(row_type row, col_type col, idx_type cell) const;
 
+       ///
+       // helper functions for plain text
+       ///
+       bool plaintextTopHLine(odocstringstream &, row_type row,
+                              std::vector<unsigned int> const &) const;
+       ///
+       bool plaintextBottomHLine(odocstringstream &, row_type row,
+                                 std::vector<unsigned int> const &) const;
+       ///
+       void plaintextPrintCell(odocstringstream &,
+                               OutputParams const &,
+                               idx_type cell, row_type row, col_type column,
+                               std::vector<unsigned int> const &,
+                               bool onlydata, size_t max_length) const;
+
+       ///
+       // helper function for LaTeX
+       ///
+       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>,
+                           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>,
+                                     std::list<col_type>) const;
+
 }; // Tabular
 
 
@@ -1119,7 +1124,7 @@ public:
        ///
        docstring completionPrefix(Cursor const & cur) const override;
        ///
-       bool insertCompletion(Cursor & cur, docstring const & s, bool finished) override;
+       bool insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/) override;
        ///
        void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const override;
        ///