X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathMBox.cpp;h=8facb40d68d65ee852e3eb31e69063d67d44e1a3;hb=5e0121cf5854a2a0039e6cb4970aeddb18bd4b23;hp=882c93b6189fc4e66576a2d05c9b87c6dec249e3;hpb=2bff0157b6f2738723720e429e66e2a138b2d0d0;p=lyx.git

diff --git a/src/mathed/InsetMathMBox.cpp b/src/mathed/InsetMathMBox.cpp
index 882c93b618..8facb40d68 100644
--- a/src/mathed/InsetMathMBox.cpp
+++ b/src/mathed/InsetMathMBox.cpp
@@ -18,7 +18,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Cursor.h"
-#include "debug.h"
 #include "MetricsInfo.h"
 #include "output_latex.h"
 #include "OutputParams.h"
@@ -26,10 +25,11 @@
 #include "TexRow.h"
 #include "TextMetrics.h"
 
+#include "support/debug.h"
 
-namespace lyx {
+using namespace std;
 
-using std::endl;
+namespace lyx {
 
 
 InsetMathMBox::InsetMathMBox()
@@ -39,11 +39,11 @@ InsetMathMBox::InsetMathMBox()
 }
 
 
-InsetMathMBox::InsetMathMBox(LayoutPtr const & layout)
+InsetMathMBox::InsetMathMBox(Layout const & layout)
 {
 	text_.paragraphs().clear();
 	text_.paragraphs().push_back(Paragraph());
-	text_.paragraphs().back().layout(layout);
+	text_.paragraphs().back().setLayout(layout);
 }
 
 
@@ -53,50 +53,45 @@ Inset * InsetMathMBox::clone() const
 }
 
 
-bool InsetMathMBox::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathMBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	TextMetrics & tm = mi.base.bv->textMetrics(&text_);
 	tm.metrics(mi, dim);
 	metricsMarkers2(dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
 }
 
 
 void InsetMathMBox::draw(PainterInfo & pi, int x, int y) const
 {
-	text_.draw(pi, x + 1, y);
+	pi.base.bv->textMetrics(&text_).draw(pi, x + 1, y);
 	drawMarkers(pi, x, y);
 }
 
 
-void InsetMathMBox::write(Buffer const & buf, WriteStream & ws) const
+void InsetMathMBox::write(WriteStream & ws) const
 {
 	if (ws.latex()) {
 		ws << "\\mbox{\n";
 		TexRow texrow;
-		OutputParams runparams(&buf.params().encoding());
-		latexParagraphs(buf, text_.paragraphs(), ws.os(), texrow, runparams);
+		OutputParams runparams(&buffer().params().encoding());
+		latexParagraphs(buffer(), text_, ws.os(), texrow, runparams);
 		ws.addlines(texrow.rows());
 		ws << "}";
 	} else {
 		ws << "\\mbox{\n";
-		std::ostringstream os;
-		text_.write(buf, os);
+		ostringstream os;
+		text_.write(buffer(), os);
 		ws.os() << from_utf8(os.str());
 		ws << "}";
 	}
 }
 
 
-int InsetMathMBox::latex(Buffer const & buf, odocstream & os,
-			OutputParams const & runparams) const
+int InsetMathMBox::latex(odocstream & os, OutputParams const & runparams) const
 {
 	os << "\\mbox{\n";
 	TexRow texrow;
-	latexParagraphs(buf, text_.paragraphs(), os, texrow, runparams);
+	latexParagraphs(buffer(), text_, os, texrow, runparams);
 	os << "}";
 	return texrow.rows();
 }
@@ -117,14 +112,8 @@ Text * InsetMathMBox::getText(int) const
 void InsetMathMBox::cursorPos(BufferView const & bv,
 		CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
-	x = text_.cursorX(bv, sl, boundary);
-	y = text_.cursorY(bv, sl, boundary);
-}
-
-
-void InsetMathMBox::drawSelection(PainterInfo & pi, int x, int y) const
-{
-	pi.base.bv->textMetrics(&text_).drawSelection(pi, x, y);
+	x = bv.textMetrics(&text_).cursorX(sl, boundary);
+	y = bv.textMetrics(&text_).cursorY(sl, boundary);
 }