Remove dead code + whitespace

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

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index 405e2be7dcc6cf805e7820f8332bd019acfe485d..82960b262e338ffa118bed2d04c035fac6aaefb1 100644 (file)
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -3,6 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
+ * \author Abdelrazak Younes
  * \author André Pönitz
  * \author Uwe Stöhr
  *
@@ -14,6 +15,7 @@
 #include "InsetLine.h"
 
 #include "Buffer.h"
+#include "Cursor.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
@@ -33,6 +35,8 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include <cstdlib>
+
 using namespace std;
 
 namespace lyx {
@@ -41,7 +45,7 @@ using frontend::Painter;
 
 
 InsetLine::InsetLine(Buffer * buf, InsetCommandParams const & p)
-       : InsetCommand(buf, p, "line")
+       : InsetCommand(buf, p)
 {}
 
 
@@ -70,12 +74,12 @@ void InsetLine::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(LINE_CODE);
                // FIXME UNICODE
-               InsetCommand::string2params("line",
-                       to_utf8(cmd.argument()), p);
+               InsetCommand::string2params(to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
                        cur.noScreenUpdate();
                        break;
                }
+               cur.recordUndo();
                setParams(p);
                break;
        }
@@ -116,17 +120,17 @@ 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")));
        offset_ = offset.inPixels(max_width, fm.width(char_type('M')));
 
-       dim.asc = max(fm.maxAscent(), offset_ + height_/2);
-       dim.des = max(fm.maxDescent(), height_/2 - offset_);
+       dim.asc = max(fm.maxAscent(), offset_ + height_);
+       dim.des = max(fm.maxDescent(), - offset_);
 
        // Cache the inset dimension
        setDimCache(mi, dim);
@@ -159,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")));
@@ -178,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;
@@ -199,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();
 }