bug + spped fixes + small stuff

[lyx.git] / src / mathed / math_fontinset.C

diff --git a/src/mathed/math_fontinset.C b/src/mathed/math_fontinset.C
index d9728d6573ab47409ba7f50350a59cde6608a1fd..b4ad80771cd9858be080f9e46211bd66c2d190a6 100644 (file)
--- a/src/mathed/math_fontinset.C
+++ b/src/mathed/math_fontinset.C
@@ -11,14 +11,13 @@
 #include <config.h>
 
 #include "math_fontinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
 #include "math_parser.h"
 #include "LaTeXFeatures.h"
-#include "support/LOstream.h"
-#include "textpainter.h"
+#include "support/std_ostream.h"
 
+using std::string;
 using std::auto_ptr;
 
 
@@ -46,9 +45,9 @@ MathInset::mode_type MathFontInset::currentMode() const
 void MathFontInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        FontSetChanger dummy(mi.base, key_->name.c_str());
-       cell(0).metrics(mi, dim_);
-       metricsMarkers(1);
-       dim = dim_;
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
@@ -60,7 +59,7 @@ void MathFontInset::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void MathFontInset::metricsT(TextMetricsInfo const & mi, Dimension & /*dim*/) const
+void MathFontInset::metricsT(TextMetricsInfo const & mi, Dimension &) const
 {
        cell(0).metricsT(mi, dim_);
 }