X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacroTemplate.cpp;h=2c6cbf7a82cdb34a4d2424135e92fcfcc1f52a99;hb=5fdc577badb1cb133d6a0dc7d831bb1f82576adb;hp=b4d1c1cfcb334122939aadd42b9044ac64356d80;hpb=9a9a6a8c8f12cb8b0e713a9a1ed3c5763fa25c66;p=lyx.git

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index b4d1c1cfcb..2c6cbf7a82 100644
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -544,7 +544,7 @@ void MathMacroTemplate::createLook(int args) const
 void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	Changer dummy1 = mi.base.changeFontSet("mathnormal");
-	Changer dummy2 = mi.base.changeStyle(LM_ST_TEXT);
+	Changer dummy2 = mi.base.font.changeStyle(LM_ST_TEXT);
 
 	// valid macro?
 	MacroData const * macro = 0;
@@ -578,8 +578,6 @@ void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
 	dim.wid += 6;
 	dim.des += 2;
 	dim.asc += 2;
-
-	setDimCache(mi, dim);
 }
 
 
@@ -588,9 +586,8 @@ void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const
 	// FIXME: Calling Changer on the same object repeatedly is inefficient.
 	Changer dummy0 = pi.base.font.changeColor(Color_math);
 	Changer dummy1 = pi.base.changeFontSet("mathnormal");
-	Changer dummy2 = pi.base.changeStyle(LM_ST_TEXT);
+	Changer dummy2 = pi.base.font.changeStyle(LM_ST_TEXT);
 
-	setPosCache(pi, x, y);
 	Dimension const dim = dimension(*pi.base.bv);
 
 	// draw outer frame
@@ -1392,13 +1389,14 @@ string MathMacroTemplate::contextMenuName() const
 void MathMacroTemplate::addToToc(DocIterator const & pit, bool output_active,
 								 UpdateType) const
 {
-	shared_ptr<Toc> toc = buffer().tocBackend().toc("math-macro");
 	docstring str;
 	if (!validMacro())
 		str = bformat(_("Invalid macro! \\%1$s"), name());
 	else
 		str = "\\" + name();
-	toc->push_back(TocItem(pit, 0, str, output_active));
+	TocBuilder & b = buffer().tocBackend().builder("math-macro");
+	b.pushItem(pit, str, output_active);
+	b.pop();
 }