Fix drawing of empty boxes

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

diff --git a/src/mathed/InsetMathPar.cpp b/src/mathed/InsetMathPar.cpp
index e0b6345bda513683c80d862a228468c9db122c1c..e1227ac4af12cb3531b397a4ff7a60c4aec67a02 100644 (file)
--- a/src/mathed/InsetMathPar.cpp
+++ b/src/mathed/InsetMathPar.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,38 +11,33 @@
 #include <config.h>
 
 #include "InsetMathPar.h"
-#include "MathArray.h"
-#include "MathStream.h"
-#include "support/std_ostream.h"
-
 
-namespace lyx {
+#include "MathData.h"
+#include "MathStream.h"
 
+#include "MetricsInfo.h"
 
-using std::auto_ptr;
+#include <ostream>
 
+namespace lyx {
 
-InsetMathPar::InsetMathPar(MathArray const & ar)
+InsetMathPar::InsetMathPar(Buffer * buf, MathData const & ar)
+       : InsetMathHull(buf)
 {
        cells_[0] = ar;
 }
 
 
-bool InsetMathPar::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathPar::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       dim = dim_;
-       FontSetChanger dummy1(mi.base, "textnormal");
-       InsetMathGrid::metrics(mi);
-       if (dim_ == dim)
-               return false;
-       dim = dim_;
-       return true;
+       Changer dummy = mi.base.changeFontSet("textnormal");
+       InsetMathGrid::metrics(mi, dim);
 }
 
 
 void InsetMathPar::draw(PainterInfo & pi, int x, int y) const
 {
-       FontSetChanger dummy1(pi.base, "textnormal");
+       Changer dummy = pi.base.changeFontSet("textnormal");
        InsetMathGrid::draw(pi, x, y);
 }
 
@@ -60,9 +55,9 @@ void InsetMathPar::infoize(odocstream & os) const
 }
 
 
-auto_ptr<InsetBase> InsetMathPar::doClone() const
+Inset * InsetMathPar::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathPar(*this));
+       return new InsetMathPar(*this);
 }