ws changes only

[lyx.git] / src / paragraph_funcs.C

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index be520c2e93fc356ff244140d353d293f9d50fa1f..91bca9935817ba83568024db2d3051a5a562e956 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -40,14 +40,17 @@
 #include "support/lstrings.h"
 #include "support/std_sstream.h"
 
-using namespace lyx::support;
-
 using lyx::pos_type;
-//using lyx::layout_type;
+
+using lyx::support::bformat;
+using lyx::support::subst;
+
 using std::endl;
+using std::string;
 using std::istringstream;
 using std::ostream;
 
+
 extern string bibitemWidest(Buffer const &);
 
 
@@ -965,14 +968,14 @@ int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & tok
                change = Change(Change::UNCHANGED);
        } else if (token == "\\change_inserted") {
                lex.nextToken();
-               istringstream is(STRCONV(lex.getString()));
+               istringstream is(lex.getString());
                int aid;
                lyx::time_type ct;
                is >> aid >> ct;
                change = Change(Change::INSERTED, bp.author_map[aid], ct);
        } else if (token == "\\change_deleted") {
                lex.nextToken();
-               istringstream is(STRCONV(lex.getString()));
+               istringstream is(lex.getString());
                int aid;
                lyx::time_type ct;
                is >> aid >> ct;