fix crash due to invalidated iterator

[lyx.git] / src / frontends / controllers / ControlParagraph.C

diff --git a/src/frontends/controllers/ControlParagraph.C b/src/frontends/controllers/ControlParagraph.C
index 901b768511f9ffd57d85c85e6dcb77372fc9b004..88e2f7a3bb0da7ba28b1db8d6067b74f75db5725 100644 (file)
--- a/src/frontends/controllers/ControlParagraph.C
+++ b/src/frontends/controllers/ControlParagraph.C
@@ -15,11 +15,17 @@
 #include "ButtonController.h"
 #include "funcrequest.h"
 #include "lyxlex.h"
+#include "paragraph.h"
 #include "ParagraphParameters.h"
-#include "support/LAssert.h"
-#include "Lsstream.h"
 
-using namespace lyx::support;
+#include <sstream>
+
+using std::istringstream;
+using std::ostringstream;
+using std::string;
+
+namespace lyx {
+namespace frontend {
 
 ControlParagraph::ControlParagraph(Dialog & parent)
        : Dialog::Controller(parent), ininset_(false)
@@ -28,7 +34,7 @@ ControlParagraph::ControlParagraph(Dialog & parent)
 
 bool ControlParagraph::initialiseParams(string const & data)
 {
-       istringstream is(STRCONV(data));
+       istringstream is(data);
        LyXLex lex(0,0);
        lex.setStream(is);
 
@@ -118,21 +124,21 @@ void ControlParagraph::dispatchParams()
 {
        ostringstream data;
        params().write(data);
-       FuncRequest const fr(LFUN_PARAGRAPH_APPLY, STRCONV(data.str()));
+       FuncRequest const fr(LFUN_PARAGRAPH_APPLY, data.str());
        kernel().dispatch(fr);
 }
 
 
 ParagraphParameters & ControlParagraph::params()
 {
-       Assert(params_.get());
+       BOOST_ASSERT(params_.get());
        return *params_;
 }
 
 
 ParagraphParameters const & ControlParagraph::params() const
 {
-       Assert(params_.get());
+       BOOST_ASSERT(params_.get());
        return *params_;
 }
 
@@ -153,3 +159,6 @@ LyXAlignment ControlParagraph::alignDefault() const
 {
        return aligndefault_;
 }
+
+} // namespace frontend
+} // namespace lyx