X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetenv.C;h=fd2d2cca4fecf2f374c78977f9afed1094a5f72c;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=a8e7a13575baea2f9d2d4b1490145f1885f72e7d;hpb=8b67659646c6850377cb9f44a2a0a22c0e80840c;p=lyx.git

diff --git a/src/insets/insetenv.C b/src/insets/insetenv.C
index a8e7a13575..fd2d2cca4f 100644
--- a/src/insets/insetenv.C
+++ b/src/insets/insetenv.C
@@ -19,8 +19,7 @@
 #include "texrow.h"
 
 
-using lyx::docstring;
-using lyx::odocstream;
+namespace lyx {
 
 using std::string;
 using std::auto_ptr;
@@ -31,7 +30,7 @@ InsetEnvironment::InsetEnvironment
 		(BufferParams const & bp, string const & name)
 	: InsetText(bp), layout_(bp.getLyXTextClass()[name])
 {
-	setInsetName(name);
+	setInsetName(from_utf8(name));
 	setAutoBreakRows(true);
 	setDrawFrame(true);
 }
@@ -50,7 +49,7 @@ auto_ptr<InsetBase> InsetEnvironment::doClone() const
 
 void InsetEnvironment::write(Buffer const & buf, ostream & os) const
 {
-	os << "Environment " << getInsetName() << "\n";
+	os << "Environment " << to_utf8(getInsetName()) << "\n";
 	InsetText::write(buf, os);
 }
 
@@ -63,8 +62,7 @@ void InsetEnvironment::read(Buffer const & buf, LyXLex & lex)
 
 docstring const InsetEnvironment::editMessage() const
 {
-	// FIXME UNICODE
-	return _("Opened Environment Inset: ") + lyx::from_utf8(getInsetName());
+	return _("Opened Environment Inset: ") + getInsetName();
 }
 
 
@@ -72,12 +70,12 @@ int InsetEnvironment::latex(Buffer const & buf, odocstream & os,
 			    OutputParams const & runparams) const
 {
 	// FIXME UNICODE
-	os << lyx::from_utf8(layout_->latexheader);
+	os << from_utf8(layout_->latexheader);
 	TexRow texrow;
 	latexParagraphs(buf, paragraphs(), os, texrow, runparams,
 			layout_->latexparagraph);
 	// FIXME UNICODE
-	os << lyx::from_utf8(layout_->latexfooter);
+	os << from_utf8(layout_->latexfooter);
 	return texrow.rows();
 }
 
@@ -86,3 +84,6 @@ LyXLayout_ptr const & InsetEnvironment::layout() const
 {
 	return layout_;
 }
+
+
+} // namespace lyx