* src/paragraph_funcs.cpp (breakParagraph): change parameter 'flag' to

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

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 4ef9581353b9e36969c19a170285503ede8d5df5..378a21ad0c3bae8a8fb0e4b39add1c73d458c37d 100644 (file)
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -96,22 +96,19 @@ void InsetFlex::read(Buffer const & buf, Lexer & lex)
 }
 
 
-bool InsetFlex::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetFlex::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        Font tmpfont = mi.base.font;
        getDrawFont(mi.base.font);
        mi.base.font.reduce(Font(Font::ALL_SANE));
        mi.base.font.realize(tmpfont);
-       bool changed = InsetCollapsable::metrics(mi, dim);
+       InsetCollapsable::metrics(mi, dim);
        mi.base.font = tmpfont;
-       return changed;
 }
 
 
 void InsetFlex::draw(PainterInfo & pi, int x, int y) const
 {
-       setPosCache(pi, x, y);
-
        Font tmpfont = pi.base.font;
        getDrawFont(pi.base.font);
        // I don't understand why the above .reduce and .realize aren't
@@ -139,7 +136,6 @@ bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
        switch (cmd.action) {
                // paragraph breaks not allowed in flex insets
                case LFUN_BREAK_PARAGRAPH:
-               case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
                case LFUN_BREAK_PARAGRAPH_SKIP:
                        status.enabled(false);
                        return true;