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 76c090670ff487963dac54e9c9dcc4a11c0d24b0..3dbbaa1085fe80357a83ed4be13e3c42a99c1aa1 100644 (file)
--- a/src/insets/InsetNewline.h
+++ b/src/insets/InsetNewline.h
@@ -60,7 +60,7 @@ private:
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       int latex(otexstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
@@ -77,7 +77,7 @@ private:
        ///
        ColorCode ColorName() const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        Inset * clone() const { return new InsetNewline(*this); }
        ///