X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_extern.C;h=8f26fd7c5e5e3d66da7cd2fe0b33cdf398dcfb9f;hb=cd03e2b7db8379a91f3d31eac2c5bc25b159c541;hp=d719c8af69767870abed6abed84d97467e07f6ec;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C
index d719c8af69..8f26fd7c5e 100644
--- a/src/mathed/math_extern.C
+++ b/src/mathed/math_extern.C
@@ -18,6 +18,7 @@
 #include "math_arrayinset.h"
 #include "math_charinset.h"
 #include "math_deliminset.h"
+#include "math_data.h"
 #include "math_diffinset.h"
 #include "math_exfuncinset.h"
 #include "math_exintinset.h"
@@ -37,12 +38,18 @@
 
 #include <algorithm>
 
-using namespace lyx::support;
+using lyx::support::cmd_ret;
+using lyx::support::getVectorFromString;
+using lyx::support::LibFileSearch;
+using lyx::support::RunCommand;
+using lyx::support::subst;
 
-using std::ostream;
-using std::istringstream;
-using std::find_if;
 using std::endl;
+using std::find_if;
+
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
 
 
 ostream & operator<<(ostream & os, MathArray const & ar)
@@ -931,7 +938,7 @@ namespace {
 		ostringstream os;
 		MaximaStream ms(os);
 		ms << ar;
-		string expr = STRCONV(os.str());
+		string expr = os.str();
 		string const header = "SIMPSUM:true;";
 
 		string out;
@@ -1054,7 +1061,7 @@ namespace {
 		ostringstream os;
 		MapleStream ms(os);
 		ms << ar;
-		string expr = STRCONV(os.str());
+		string expr = os.str();
 		lyxerr << "ar: '" << ar << "'\n"
 		       << "ms: '" << os.str() << "'" << endl;
 
@@ -1102,7 +1109,7 @@ namespace {
 		ostringstream os;
 		OctaveStream vs(os);
 		vs << ar;
-		string expr = STRCONV(os.str());
+		string expr = os.str();
 		string out;
 
 		lyxerr << "pipe: ar: '" << ar << "'\n"
@@ -1186,7 +1193,7 @@ MathArray pipeThroughExtern(string const & lang, string const & extra,
 	os << '[' << extra << ' ';
 	ns << ar;
 	os << ']';
-	string data = STRCONV(os.str());
+	string data = os.str();
 
 	// search external script
 	string file = LibFileSearch("mathed", "extern_" + lang);