Add a document-wide default bibliography style \biblio_style.

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

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 10516fe2a5b6d0860d99f15e387ce47109ffb808..81b6c14e5a2f50dc6ad3e575f4b39fa4470161b8 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -465,7 +465,8 @@ public:
        ///
        bool isMultiColumn(idx_type cell) const;
        ///
-       idx_type setMultiColumn(idx_type cell, idx_type number);
+       idx_type setMultiColumn(idx_type cell, idx_type number,
+                            bool const right_border);
        ///
        void unsetMultiColumn(idx_type cell);
        ///
@@ -823,9 +824,9 @@ public:
        ///
        InsetCode lyxCode() const { return TABULAR_CODE; }
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       std::string contextMenu(BufferView const &, int, int) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        /// get offset of this cursor slice relative to our upper left corner
        void cursorPos(BufferView const & bv, CursorSlice const & sl,
                bool boundary, int & x, int & y) const;