Further cleanup of collapsable insets. The layouts are now properly read and applied.

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

diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp
index bedacaf228346ef80cdef31cb0d7af139faa5778..5a1af78d3e11d3082133a584ca9e5c805a5cdb1b 100644 (file)
--- a/src/insets/InsetNewline.cpp
+++ b/src/insets/InsetNewline.cpp
@@ -13,12 +13,9 @@
 #include "InsetNewline.h"
 
 #include "debug.h"
-#include "LColor.h"
-#include "LyXText.h"
+#include "Dimension.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
-#include "Paragraph.h"
-#include "paragraph_funcs.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
@@ -30,7 +27,7 @@ using std::endl;
 using std::ostream;
 
 
-void InsetNewline::read(Buffer const &, LyXLex &)
+void InsetNewline::read(Buffer const &, Lexer &)
 {
        /* Nothing to read */
 }
@@ -42,15 +39,12 @@ void InsetNewline::write(Buffer const &, ostream & os) const
 }
 
 
-bool InsetNewline::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetNewline::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
        dim.asc = fm.maxAscent();
        dim.des = fm.maxDescent();
        dim.wid = fm.width('n');
-       bool const changed = dim_ != dim;
-       dim_ = dim;
-       return changed;
 }
 
 
@@ -63,7 +57,7 @@ int InsetNewline::latex(Buffer const &, odocstream &,
 
 
 int InsetNewline::plaintext(Buffer const &, odocstream & os,
-                            OutputParams const &) const
+                           OutputParams const &) const
 {
        os << '\n';
        return PLAINTEXT_NEWLINE;
@@ -101,7 +95,7 @@ void InsetNewline::draw(PainterInfo & pi, int x, int y) const
                xp[2] = int(x + wid * 0.625);
        }
 
-       pi.pain.lines(xp, yp, 3, LColor::eolmarker);
+       pi.pain.lines(xp, yp, 3, Color_eolmarker);
 
        yp[0] = int(y - 0.500 * asc * 0.75);
        yp[1] = int(y - 0.500 * asc * 0.75);
@@ -117,7 +111,7 @@ void InsetNewline::draw(PainterInfo & pi, int x, int y) const
                xp[2] = int(x);
        }
 
-       pi.pain.lines(xp, yp, 3, LColor::eolmarker);
+       pi.pain.lines(xp, yp, 3, Color_eolmarker);
 }