From: Richard Heck <rgheck@comcast.net>
Date: Sat, 25 Oct 2008 15:10:54 +0000 (+0000)
Subject: At least partially fix problem noted by Vincent. We were being over-agressive
X-Git-Tag: 1.6.10~2851
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=fec782342fffc8466c5c6a5e05337f35570203cb;p=features.git

At least partially fix problem noted by Vincent. We were being over-agressive
with the fix at r26163.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27111 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Text2.cpp b/src/Text2.cpp
index de328e3e2a..ea53475267 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -117,13 +117,7 @@ FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const
 		// In case the default family has been customized
 		if (layout.labelfont.family() == INHERIT_FAMILY)
 			lf.setFamily(buffer.params().getFont().fontInfo().family());
-		// FIXME As above....
-		InsetCollapsable const * icp = par.inInset().asInsetCollapsable();
-		if (!icp)
-			return lf;
-		FontInfo icf = icp->getLayout().labelfont();
-		icf.realize(lf);
-		return icf;
+		return lf;
 	}
 
 	FontInfo font = layout.labelfont;