last Friday's text*.C -> text_func shuffle

[lyx.git] / src / ParagraphParameters.C

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index 6319f670054b10a555737573a681a571e99298e8..958e3b1f416c8a2669721dae940728cd0cc86a17 100644 (file)
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -7,6 +7,7 @@
 
 #include "buffer.h"
 #include "BufferView.h"
+#include "Lsstream.h"
 #include "gettext.h"
 #include "paragraph.h"
 #include "lyxtext.h"
@@ -18,6 +19,8 @@
 
 #include <iostream>
 
+using namespace lyx::support;
+
 using std::ostream;
 
 // Initialize static member var.
@@ -420,7 +423,7 @@ void ParagraphParameters::write(ostream & os) const
 
 void setParagraphParams(BufferView & bv, string const & data)
 {
-       istringstream is(data);
+       istringstream is(STRCONV(data));
        LyXLex lex(0,0);
        lex.setStream(is);
 
@@ -469,7 +472,7 @@ void params2string(Paragraph const & par, string & data)
        os << "\\aligndefault " << layout->align << '\n';
 
        /// is paragraph in inset
-       os << "\\ininset " << par.inInset() << '\n';
+       os << "\\ininset " << (par.inInset()?1:0) << '\n';
 
-       data = os.str();
+       data = STRCONV(os.str());
 }