reduce number of metrics calls in InsetTabular calculate_dimensions_

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index 50d287d9a3d55cae96bbbf92bbbf3e4d96acbaa1..82f19f801cd7849f217a9348aa05fd8bab62d2fe 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -86,7 +86,7 @@ string const Inset::editMessage() const
 }
 
 
-LyXText * Inset::getLyXText(BufferView const * bv, bool const recursive) const
+LyXText * Inset::getLyXText(BufferView const * bv, bool /*recursive*/) const
 {
        if (owner())
                return owner()->getLyXText(bv, false);
@@ -145,9 +145,7 @@ int Inset::latexTextWidth(BufferView * bv) const
 int Inset::ascent(BufferView * bv, LyXFont const & font) const
 {
        Dimension dim;
-       MetricsInfo mi;
-       mi.base.bv = bv;
-       mi.base.font = font;
+       MetricsInfo mi(bv, font);
        metrics(mi, dim);
        return dim.ascent();
 }
@@ -156,9 +154,7 @@ int Inset::ascent(BufferView * bv, LyXFont const & font) const
 int Inset::descent(BufferView * bv, LyXFont const & font) const
 {
        Dimension dim;
-       MetricsInfo mi;
-       mi.base.bv = bv;
-       mi.base.font = font;
+       MetricsInfo mi(bv, font);
        metrics(mi, dim);
        return dim.descent();
 }
@@ -167,9 +163,7 @@ int Inset::descent(BufferView * bv, LyXFont const & font) const
 int Inset::width(BufferView * bv, LyXFont const & font) const
 {
        Dimension dim;
-       MetricsInfo mi;
-       mi.base.bv = bv;
-       mi.base.font = font;
+       MetricsInfo mi(bv, font);
        metrics(mi, dim);
        return dim.width();
 }