some reindentation, revert workarea xpos++, constify, remove all traces of LyXParagra...

[lyx.git] / src / insets / insetcollapsable.C

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 6fcd31120ca89029a35633af4e5226288bead464..d1cd344fea309d4d5c99f0dc63a2b5290279f72b 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -49,19 +49,6 @@ InsetCollapsable::InsetCollapsable()
 }
 
 
-#if 0
-Inset * InsetCollapsable::Clone(Buffer const &) const
-{
-       InsetCollapsable * result = new InsetCollapsable;
-       result->inset.init(&inset);
-       result->inset.setOwner(result);
-
-       result->collapsed = collapsed;
-       return result;
-}
-#endif
-
-
 bool InsetCollapsable::InsertInset(BufferView * bv, Inset * in)
 {
        if (!InsertInsetAllowed(in)) {
@@ -169,8 +156,8 @@ void InsetCollapsable::draw_collapsed(Painter & pain, LyXFont const &,
 }
 
 
-void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
-                            int baseline, float & x, bool cleared) const
+void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, 
+                           int baseline, float & x, bool cleared) const
 {
        if (nodraw())
                return;
@@ -212,7 +199,7 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
                int h = ascent(bv, f) + descent(bv, f);
                int const tx = (needFullRow() && !owner()) ? 0 : int(x);
                int const ty = max(0, baseline - ascent(bv, f));
-               
+
                if ((ty + h) > pain.paperHeight())
                        h = pain.paperHeight();
                if ((top_x + w) > pain.paperWidth())
@@ -251,7 +238,7 @@ void InsetCollapsable::Edit(BufferView * bv, int xp, int yp,
        } else if (!collapsed) {
                if (!bv->lockInset(this))
                        return;
-               inset.Edit(bv, xp, yp+(top_baseline - inset.y()), button);
+               inset.Edit(bv, xp, yp + (top_baseline - inset.y()), button);
        }
 }
 
@@ -402,8 +389,7 @@ bool InsetCollapsable::UnlockInsetInInset(BufferView * bv, UpdatableInset * in,
                bv->unlockInset(this);
                return true;
        }
-       bool ret = inset.UnlockInsetInInset(bv, in, lr);
-       return ret;
+       return inset.UnlockInsetInInset(bv, in, lr);
 }