fix compilation pb ; update eu.po

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

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index ba3b72318cf0becac025cdf2bddcd57fbdfa7ee5..e73455ce2a3cb27b3d3d173e14f1eb6ae4fd0d2b 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -169,8 +169,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;
@@ -194,7 +194,7 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
        UpdatableInset::draw(bv, f, baseline, x, cleared);
 #else
        if (!owner())
-               x += (float)scroll();
+               x += static_cast<float>(scroll());
 #endif
        if (!cleared && (inset.need_update == InsetText::FULL ||
                         inset.need_update == InsetText::INIT ||
@@ -212,7 +212,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 +251,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 +402,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);
 }