ws changes only

[lyx.git] / src / ParagraphParameters.C

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index ef62737f6dec279f3fbb1b717a9c60b731488a75..cd9bd49bc0c99c76c7d426dce711a3d36f6ba7e1 100644 (file)
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -19,6 +19,7 @@
 #include "buffer.h"
 #include "BufferView.h"
 #include "gettext.h"
+#include "lyxlayout.h"
 #include "lyxlex.h"
 #include "lyxtext.h"
 #include "paragraph.h"
@@ -31,11 +32,12 @@
 
 #include "support/std_sstream.h"
 
-using namespace lyx::support;
+using lyx::support::rtrim;
 
 using std::istringstream;
 using std::ostream;
 using std::ostringstream;
+using std::string;
 
 
 // Initialize static member var.
@@ -445,7 +447,7 @@ void ParagraphParameters::write(ostream & os) const
 
 void setParagraphParams(BufferView & bv, string const & data)
 {
-       istringstream is(STRCONV(data));
+       istringstream is(data);
        LyXLex lex(0,0);
        lex.setStream(is);
 
@@ -494,5 +496,5 @@ void params2string(Paragraph const & par, string & data)
        /// is paragraph in inset
        os << "\\ininset " << (par.inInset()?1:0) << '\n';
 
-       data = STRCONV(os.str());
+       data = os.str();
 }