Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / Text2.cpp

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 8abecd92082db52d7b2e19bcb8c2c6389f931d5f..e9d1131808508945dff8f66910b5c6a53174a8ac 100644 (file)
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -31,11 +31,9 @@
 #include "Changes.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "gettext.h"
 #include "Language.h"
 #include "Layout.h"
 #include "Lexer.h"
@@ -45,8 +43,6 @@
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
-#include "Server.h"
-#include "ServerSocket.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
 #include "VSpace.h"
@@ -57,19 +53,15 @@
 
 #include "mathed/InsetMathHull.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/textutils.h"
 
-#include <boost/current_function.hpp>
 #include <boost/next_prior.hpp>
 
 #include <sstream>
 
-using std::endl;
-using std::ostringstream;
-using std::string;
-using std::max;
-using std::min;
-using std::istringstream;
+using namespace std;
 
 namespace lyx {
 
@@ -820,7 +812,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
                bool const soa = oldpar.params().startOfAppendix();
                plist.erase(boost::next(plist.begin(), old.pit()));
                // do not lose start of appendix marker (bug 4212)
-               if (soa && old.pit() < plist.size())
+               if (soa && old.pit() < pit_type(plist.size()))
                        plist[old.pit()].params().startOfAppendix(true);
 
                // see #warning (FIXME?) above