revert last patch. there's something wrong, possibly unrelated to this

[lyx.git] / src / mathed / InsetMathBrace.cpp

diff --git a/src/mathed/InsetMathBrace.cpp b/src/mathed/InsetMathBrace.cpp
index 769474941e5e86afa38536d90b1a95a14c22ec15..d5b6da44dc768f3cb3f09a8fea6a8ba4570eaff4 100644 (file)
--- a/src/mathed/InsetMathBrace.cpp
+++ b/src/mathed/InsetMathBrace.cpp
@@ -11,14 +11,18 @@
 #include <config.h>
 
 #include "InsetMathBrace.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
+#include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include "support/std_ostream.h"
+#include <ostream>
+
+using namespace std;
 
 namespace lyx {
 
@@ -45,12 +49,10 @@ void InsetMathBrace::metrics(MetricsInfo & mi, Dimension & dim) const
        Dimension dim0;
        cell(0).metrics(mi, dim0);
        Dimension t = theFontMetrics(mi.base.font).dimension('{');
-       dim.asc = std::max(dim0.asc, t.asc);
-       dim.des = std::max(dim0.des, t.des);
+       dim.asc = max(dim0.asc, t.asc);
+       dim.des = max(dim0.des, t.des);
        dim.wid = dim0.width() + 2 * t.wid;
        metricsMarkers(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }