fix crash due to invalidated iterator

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

diff --git a/src/frontends/controllers/ControlERT.C b/src/frontends/controllers/ControlERT.C
index b0090fa97cca686c927b3d781793afd1651060dd..a809f7795e40b506872d1b2961f83c88f16dd1e5 100644 (file)
--- a/src/frontends/controllers/ControlERT.C
+++ b/src/frontends/controllers/ControlERT.C
@@ -6,57 +6,43 @@
  * \author Jürgen Vigna
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "ControlERT.h"
+#include "funcrequest.h"
+
 
-// sorry this is just a temporary hack we should include vspace.h! (Jug)
-extern const char * stringFromUnit(int);
+using std::string;
 
+namespace lyx {
+namespace frontend {
 
-ControlERT::ControlERT(LyXView & lv, Dialogs & d)
-       : ControlInset<InsetERT, ERTParams>(lv, d)
+ControlERT::ControlERT(Dialog & parent)
+       : Dialog::Controller(parent), status_(InsetERT::Collapsed)
 {}
 
 
-void ControlERT::applyParamsToInset()
+bool ControlERT::initialiseParams(string const & data)
 {
-       inset()->status(bufferview(), params().status);
+       InsetERTMailer::string2params(data, status_);
+       return true;
 }
 
 
-void ControlERT::applyParamsNoInset()
+void ControlERT::clearParams()
 {
+       status_ = InsetERT::Collapsed;
 }
 
 
-ERTParams const ControlERT::getParams(InsetERT const & inset)
+void ControlERT::dispatchParams()
 {
-       return ERTParams(inset);
+       string const lfun = InsetERTMailer::params2string(status_);
+       kernel().dispatch(FuncRequest(getLfun(), lfun));
 }
 
-
-ERTParams::ERTParams()
-       : status(InsetERT::Collapsed)
-{}
-
-
-ERTParams::ERTParams(InsetERT const & inset)
-       : status(inset.status())
-{}
-
-
-bool operator==(ERTParams const & p1, ERTParams const & p2)
-{
-       return (p1.status == p2.status);
-}
-
-
-bool operator!=(ERTParams const & p1, ERTParams const & p2)
-{
-       return !(p1 == p2);
-}
+} // namespace frontend
+} // namespace lyx