Fix InsetInclude properly. Data is now stored in an InsetCommandParams

[lyx.git] / src / graphics / GraphicsConverter.C

diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C
index 2f4a25487ab77f3666bde7df222975f9d5587d46..b75095ecd0fca4d1514d0be53f2f3638d6183334 100644 (file)
--- a/src/graphics/GraphicsConverter.C
+++ b/src/graphics/GraphicsConverter.C
@@ -24,7 +24,7 @@
 
 #include <boost/bind.hpp>
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include <fstream>
 
 namespace support = lyx::support;
@@ -43,6 +43,7 @@ using support::unlink;
 
 using std::endl;
 using std::ostream;
+using std::ostringstream;
 
 
 namespace lyx {
@@ -176,7 +177,7 @@ Converter::Impl::Impl(string const & from_file,   string const & to_file_base,
 
                lyxerr[Debug::GRAPHICS] << "\tConversion script:"
                        << "\n--------------------------------------\n"
-                       << STRCONV(script.str())
+                       << script.str()
                        << "\n--------------------------------------\n";
 
                // Output the script to file.
@@ -188,7 +189,7 @@ Converter::Impl::Impl(string const & from_file,   string const & to_file_base,
                if (!fs.good())
                        return;
 
-               fs << STRCONV(script.str());
+               fs << script.str();
                fs.close();
 
                // The command needed to run the conversion process
@@ -258,7 +259,7 @@ string const move_file(string const & from_file, string const & to_file)
                << "\t'rm' -f ${fromfile}\n"
                << "}\n";
 
-       return STRCONV(command.str());
+       return command.str();
 }