// now, because Inset::getLayout() will return a default-constructed
// InsetLayout, and that e.g. sets the foreground color to red. So we
// need to do some work to make that possible.
- Inset const * inset = pars_[pit].inInset();
- InsetCollapsable const * icp = inset? inset->asInsetCollapsable() : 0;
+ InsetCollapsable const * icp = pars_[pit].inInset().asInsetCollapsable();
if (!icp)
return lf;
FontInfo icf = icp->getLayout().font();
// In case the default family has been customized
if (layout.labelfont.family() == INHERIT_FAMILY)
lf.setFamily(buffer.params().getFont().fontInfo().family());
- // FIXME As above....
- Inset const * inset = par.inInset();
- InsetCollapsable const * icp = inset? inset->asInsetCollapsable() : 0;
- if (!icp)
- return lf;
- FontInfo icf = icp->getLayout().labelfont();
- icf.realize(lf);
- return icf;
+ return lf;
}
FontInfo font = layout.labelfont;
// return past-the-last paragraph influenced by a layout change on pit
pit_type Text::undoSpan(pit_type pit)
{
- pit_type end = paragraphs().size();
+ pit_type const end = paragraphs().size();
pit_type nextpit = pit + 1;
if (nextpit == end)
return nextpit;