This should be the last of the commits refactoring the InsetLayout code.

[lyx.git] / src / insets / InsetEnvironment.cpp

diff --git a/src/insets/InsetEnvironment.cpp b/src/insets/InsetEnvironment.cpp
index ed28bc65ffeb70ca2db428a789f094974994e316..73048ab52e87a8b9bb257c337e12733ed6b131c4 100644 (file)
--- a/src/insets/InsetEnvironment.cpp
+++ b/src/insets/InsetEnvironment.cpp
@@ -13,18 +13,17 @@
 #include "InsetEnvironment.h"
 
 #include "BufferParams.h"
-#include "gettext.h"
+#include "support/gettext.h"
+#include "Layout.h"
 #include "OutputParams.h"
 #include "output_latex.h"
 #include "TexRow.h"
+#include "TextClass.h"
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-using std::ostream;
-
 
 InsetEnvironment::InsetEnvironment
                (BufferParams const & bp, docstring const & name)
@@ -40,9 +39,9 @@ InsetEnvironment::InsetEnvironment(InsetEnvironment const & in)
 {}
 
 
-auto_ptr<Inset> InsetEnvironment::doClone() const
+Inset * InsetEnvironment::clone() const
 {
-       return auto_ptr<Inset>(new InsetEnvironment(*this));
+       return new InsetEnvironment(*this);
 }
 
 
@@ -71,7 +70,7 @@ int InsetEnvironment::latex(Buffer const & buf, odocstream & os,
        // FIXME UNICODE
        os << from_utf8(layout_->latexheader);
        TexRow texrow;
-       latexParagraphs(buf, paragraphs(), os, texrow, runparams,
+       latexParagraphs(buf, text_, os, texrow, runparams,
                        layout_->latexparagraph);
        // FIXME UNICODE
        os << from_utf8(layout_->latexfooter);