Move <algorithm> from DocIterator.h

[lyx.git] / src / mathed / InsetMathMatrix.h

diff --git a/src/mathed/InsetMathMatrix.h b/src/mathed/InsetMathMatrix.h
index a62c8ea44b7bfb5a020e962b9810758b20099950..6f13b0f6293dd97453bf4d2866b2ab716bb88a9c 100644 (file)
--- a/src/mathed/InsetMathMatrix.h
+++ b/src/mathed/InsetMathMatrix.h
@@ -24,30 +24,34 @@ namespace lyx {
 class InsetMathMatrix : public InsetMathGrid {
 public:
        ///
-       explicit InsetMathMatrix(InsetMathGrid const &, 
+       explicit InsetMathMatrix(InsetMathGrid const &,
                        docstring const & left, docstring const & right);
        /// identifies MatrixInsets
-       InsetMathMatrix const * asMatrixInset() const { return this; }
+       InsetMathMatrix const * asMatrixInset() const override { return this; }
 
        ///
-       void write(WriteStream & os) const;
+       void write(WriteStream & os) const override;
        ///
-       void normalize(NormalStream &) const;
+       void normalize(NormalStream &) const override;
        ///
-       void maple(MapleStream &) const;
+       void maple(MapleStream &) const override;
        ///
-       void maxima(MaximaStream &) const;
+       void maxima(MaximaStream &) const override;
        ///
-       void mathematica(MathematicaStream &) const;
+       void mathematica(MathematicaStream &) const override;
        ///
-       void mathmlize(MathStream &) const;
+       void mathmlize(MathStream &) const override;
        ///
-       void octave(OctaveStream &) const;
+       void htmlize(HtmlStream &) const override;
        ///
-       InsetCode lyxCode() const { return MATH_MATRIX_CODE; }
+       void octave(OctaveStream &) const override;
+       ///
+       InsetCode lyxCode() const override { return MATH_MATRIX_CODE; }
+       ///
+       bool handlesMulticolumn() const override { return true; }
 
 private:
-       virtual Inset * clone() const;
+       Inset * clone() const override;
        ///
        docstring left_;
        ///