DocBook, InsetFloat: avoid a potential nullptr dereference when detecting the type...

[features.git] / src / insets / InsetCollapsible.cpp

diff --git a/src/insets/InsetCollapsible.cpp b/src/insets/InsetCollapsible.cpp
index 24aca669452a429c05a91f2728b324a816c75a81..84bb314f3c667e619149d23e6c2f63ab68faa67f 100644 (file)
--- a/src/insets/InsetCollapsible.cpp
+++ b/src/insets/InsetCollapsible.cpp
@@ -187,9 +187,12 @@ Dimension InsetCollapsible::dimensionCollapsed(BufferView const & bv) const
 {
        Dimension dim;
        FontInfo labelfont(getLabelfont());
+       int const offset =
+               (geometry(bv) != LeftButton && geometry(bv) != TopButton)
+               ? Inset::textOffset(&bv) : 0;
        labelfont.realize(sane_font);
        theFontMetrics(labelfont).buttonText(
-               buttonLabel(bv), Inset::textOffset(&bv), dim.wid, dim.asc, dim.des);
+               buttonLabel(bv), offset, dim.wid, dim.asc, dim.des);
        return dim;
 }
 
@@ -198,10 +201,6 @@ void InsetCollapsible::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        view_[mi.base.bv].auto_open_ = mi.base.bv->cursor().isInside(this);
 
-       FontInfo tmpfont = mi.base.font;
-       mi.base.font = getFont();
-       mi.base.font.realize(tmpfont);
-
        BufferView const & bv = *mi.base.bv;
 
        switch (geometry(bv)) {
@@ -251,8 +250,6 @@ void InsetCollapsible::metrics(MetricsInfo & mi, Dimension & dim) const
                }
                break;
        }
-
-       mi.base.font = tmpfont;
 }
 
 
@@ -725,18 +722,6 @@ InsetDecoration InsetCollapsible::decoration() const
 }
 
 
-FontInfo InsetCollapsible::getFont() const
-{
-       return getLayout().font();
-}
-
-
-FontInfo InsetCollapsible::getLabelfont() const
-{
-       return getLayout().labelfont();
-}
-
-
 string InsetCollapsible::contextMenu(BufferView const & bv, int x,
        int y) const
 {