ws changes only

[lyx.git] / src / paragraph_funcs.C

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 0d3234783fbaf494796f89149bb52f4c956cfebd..91bca9935817ba83568024db2d3051a5a562e956 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -13,6 +13,8 @@
 #include "paragraph_funcs.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
+
 #include "debug.h"
 #include "encoding.h"
 #include "errorlist.h"
@@ -23,6 +25,8 @@
 #include "lyxlex.h"
 #include "lyxrc.h"
 #include "paragraph_pimpl.h"
+#include "texrow.h"
+#include "vspace.h"
 
 #include "insets/insetbibitem.h"
 #include "insets/insethfill.h"
@@ -33,19 +37,20 @@
 #include "insets/insetspecialchar.h"
 #include "insets/insettabular.h"
 
-#include "support/LAssert.h"
 #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 &);
 
 
@@ -963,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;
@@ -1068,7 +1073,7 @@ ParagraphList::iterator outerPar(Buffer const & buf, InsetOld const * inset)
                                return pit.outerPar();
        }
        lyxerr << "outerPar: should not happen" << endl;
-       Assert(false);
+       BOOST_ASSERT(false);
        return const_cast<Buffer &>(buf).paragraphs().end(); // shut up compiler
 }
 
@@ -1091,6 +1096,6 @@ Paragraph const & ownerPar(Buffer const & buf, InsetOld const * inset)
                                return *pit.pit();
        }
        lyxerr << "ownerPar: should not happen" << endl;
-       Assert(false);
+       BOOST_ASSERT(false);
        return buf.paragraphs().front(); // shut up compiler
 }