Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/insets/InsetNewline.h b/src/insets/InsetNewline.h
index 017d8f8201f1d2547087e34aeec958a4a21e6363..3dbbaa1085fe80357a83ed4be13e3c42a99c1aa1 100644 (file)
--- a/src/insets/InsetNewline.h
+++ b/src/insets/InsetNewline.h
@@ -44,7 +44,8 @@ public:
        ///
        InsetNewline();
        ///
-       InsetNewline(InsetNewlineParams par) { params_.kind = par.kind; }
+       InsetNewline(InsetNewlineParams par) : Inset(0)
+       { params_.kind = par.kind; }
        ///
        static void string2params(std::string const &, InsetNewlineParams &);
        ///
@@ -59,13 +60,13 @@ private:
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       int xhtml(odocstream &, OutputParams const &) const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        void read(Lexer & lex);
        ///
@@ -76,7 +77,7 @@ private:
        ///
        ColorCode ColorName() const;
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       std::string contextMenuName() const;
        ///
        Inset * clone() const { return new InsetNewline(*this); }
        ///