Remove dead code + whitespace

[lyx.git] / src / insets / InsetLine.cpp

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index 5c12d37e09539a23430ffc21be0020fd3d4eaf9d..82960b262e338ffa118bed2d04c035fac6aaefb1 100644 (file)
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -35,6 +35,8 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include <cstdlib>
+
 using namespace std;
 
 namespace lyx {
@@ -77,6 +79,7 @@ void InsetLine::doDispatch(Cursor & cur, FuncRequest & cmd)
                        cur.noScreenUpdate();
                        break;
                }
+               cur.recordUndo();
                setParams(p);
                break;
        }
@@ -117,10 +120,10 @@ void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const
 
        // set a minimal width
        int const minw = (dim.wid < 0) ? 24 : 4;
-       dim.wid = max(minw, max(dim.wid, -dim.wid));
+       dim.wid = max(minw, abs(dim.wid));
 
        Length height = Length(to_ascii(getParam("height")));
-       height_ = height.inPixels(dim.height(), fm.width(char_type('M')));
+       height_ = height.inPixels(max_width, fm.width(char_type('M')));
 
        // get the length of the parameters in pixels
        Length offset = Length(to_ascii(getParam("offset")));
@@ -160,7 +163,7 @@ void InsetLine::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-int InsetLine::latex(odocstream & os, OutputParams const &) const
+void InsetLine::latex(otexstream & os, OutputParams const &) const
 {
        bool have_offset = true;
        Length offset_len = Length(to_ascii(getParam("offset")));
@@ -179,12 +182,11 @@ int InsetLine::latex(odocstream & os, OutputParams const &) const
        if (have_offset)
                os      << "[" << from_ascii(offset) << "]";
        os << "{" << from_ascii(width) << "}{" << from_ascii(height) << '}';
-
-       return 0;
 }
 
 
-int InsetLine::plaintext(odocstream & os, OutputParams const &) const
+int InsetLine::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
        os << "\n-------------------------------------------\n";
        return PLAINTEXT_NEWLINE;
@@ -200,8 +202,7 @@ int InsetLine::docbook(odocstream & os, OutputParams const &) const
 
 docstring InsetLine::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-       xs << html::CompTag("hr");
-       xs.cr();
+       xs << html::CompTag("hr") << html::CR();
        return docstring();
 }