X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetListingsParams.cpp;h=4c0b804372e0b472f3f2a18472032b9392779625;hb=4a1be58591ea5a7431d9426abb27d8b946c634cb;hp=1e7c9b69917f5a42cdef5b212b682822ffa8ad35;hpb=bb35edd0b0cfce7782a765256b3239aa93b883d1;p=lyx.git

diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp
index 1e7c9b6991..4c0b804372 100644
--- a/src/insets/InsetListingsParams.cpp
+++ b/src/insets/InsetListingsParams.cpp
@@ -9,10 +9,11 @@
  */
 
 #include <config.h>
+#include <algorithm>
 
 #include "InsetListingsParams.h"
 
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Length.h"
 #include "Lexer.h"
 
@@ -20,28 +21,15 @@
 #include "support/textutils.h"
 #include "support/convert.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 #include <sstream>
 
-using std::map;
-using std::vector;
-using std::ostream;
-using std::string;
-using std::exception;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::trim;
-using support::rtrim;
-using support::subst;
-using support::isStrInt;
-using support::prefixIs;
-using support::suffixIs;
-using support::getVectorFromString;
-using lyx::support::contains;
-
 namespace {
 
 enum param_type {
@@ -193,7 +181,7 @@ docstring ListingsParam::validate(string const & par) const
 			lists.push_back(v);
 
 		// good, find the string
-		if (std::find(lists.begin(), lists.end(), par2) != lists.end()) {
+		if (find(lists.begin(), lists.end(), par2) != lists.end()) {
 			if (unclosed)
 				return _("Unbalanced braces!");
 			return docstring();
@@ -692,7 +680,7 @@ bool ParValidator::onoff(string const & name) const
 } // namespace anon.
 
 // define a global ParValidator
-ParValidator * par_validator = NULL;
+ParValidator * par_validator = 0;
 
 InsetListingsParams::InsetListingsParams()
 	: inline_(false), params_(), status_(InsetCollapsable::Open)
@@ -722,10 +710,9 @@ void InsetListingsParams::write(ostream & os) const
 void InsetListingsParams::read(Lexer & lex)
 {
 	lex >> inline_;
-	int s;
+	int s = Inset::Collapsed;
 	lex >> s;
-	if (lex)
-		status_ = static_cast<InsetCollapsable::CollapseStatus>(s);
+	status_ = static_cast<InsetCollapsable::CollapseStatus>(s);
 	string par;
 	lex >> par;
 	fromEncodedString(par);
@@ -809,7 +796,7 @@ void InsetListingsParams::addParams(string const & par)
 		} else if (par[i] == '=' && braces == 0) {
 			isValue = true;
 			continue;
-		} else if (par[i] == '{' && par[i - 1] == '=')
+		} else if (par[i] == '{' && i > 0 && par[i - 1] == '=')
 			braces ++;
 		else if (par[i] == '}'
 			&& (i == par.size() - 1 || par[i + 1] == ',' || par[i + 1] == '\n'))