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

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

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 2b68fc34788fd25c866a6f9497715afae7e2af88..01b5bcfe68c018764b7a1a6b64e598135c7253f3 100644 (file)
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -11,26 +11,26 @@
 #include <config.h>
 
 #include "InsetMathSplit.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
 
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 
 #include "support/lstrings.h"
-#include "support/std_ostream.h"
 
+#include <ostream>
+
+using namespace std;
 
 namespace lyx {
 
 using support::bformat;
 
-using std::string;
-using std::auto_ptr;
-
 
 InsetMathSplit::InsetMathSplit(docstring const & name, char valign)
        : InsetMathGrid(1, 1, valign, docstring()), name_(name)
@@ -38,9 +38,9 @@ InsetMathSplit::InsetMathSplit(docstring const & name, char valign)
 }
 
 
-auto_ptr<Inset> InsetMathSplit::doClone() const
+Inset * InsetMathSplit::clone() const
 {
-       return auto_ptr<Inset>(new InsetMathSplit(*this));
+       return new InsetMathSplit(*this);
 }
 
 
@@ -90,8 +90,8 @@ void InsetMathSplit::write(WriteStream & ws) const
        if (ws.fragile())
                ws << "\\protect";
        ws << "\\begin{" << name_ << '}';
-       if (name_ != "split" && valign() != 'c')
-               ws << '[' << valign() << ']';
+       if (name_ != "split" && verticalAlignment() != 'c')
+               ws << '[' << verticalAlignment() << ']';
        if (name_ == "alignedat")
                ws << '{' << static_cast<unsigned int>((ncols() + 1)/2) << '}';
        InsetMathGrid::write(ws);