Fix bug #12795

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

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 1c07ba0f05e7cab8938db9d27bb7164703317467..5602984b3339be79d73199034f71ebdb36436489 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,6 +919,8 @@ public:
        ///
        BoxType useBox(idx_type cell) const;
        ///
+       bool hasNewlines(idx_type cell) const;
+       ///
        bool isValidRow(row_type const row) const;
        ///
        void TeXRow(otexstream &, row_type const row,
@@ -943,9 +945,13 @@ private:
                DOCBOOK = false
        };
 
-       /// Transforms the vertical alignment of the given cell as a prebaked XML attribute (for HTML and CALS).
-       std::string getHAlignAsXmlAttribute(idx_type cell, XmlOutputFormat output_format) const;
-       /// Transforms the vertical alignment of the given cell as a prebaked XML attribute (for HTML and CALS).
+       /// Transforms the vertical alignment of the given cell as prebaked CSS (for HTML tables in HTML output).
+       std::string getHAlignAsXmlAttribute(idx_type cell) const;
+       /// Transforms the vertical alignment of the given cell as a prebaked XML attribute (for CALS or HTML tables in DocBook).
+       std::string getHAlignAsCssAttribute(idx_type cell) const;
+       /// Transforms the vertical alignment of the given cell as prebaked CSS (for HTML tables in HTML output).
+       std::string getVAlignAsCssAttribute(idx_type cell) const;
+       /// Transforms the vertical alignment of the given cell as a prebaked XML attribute (for CALS or HTML tables in DocBook).
        std::string getVAlignAsXmlAttribute(idx_type cell) const;
 
        /// Helpers for XML tables (XHTML or DocBook).
@@ -1124,7 +1130,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;
        ///
@@ -1144,7 +1150,8 @@ public:
        docstring asString(idx_type stidx, idx_type enidx, bool intoInsets = true);
        ///
        ParagraphList asParList(idx_type stidx, idx_type enidx);
-
+       ///
+       bool confirmDeletion() const override { return true; }
        /// Returns whether the cell in the specified row and column is selected.
        bool isCellSelected(Cursor & cur, row_type row, col_type col) const;
        ///