fix crash due to invalidated iterator

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

diff --git a/src/frontends/controllers/ControlTabularCreate.C b/src/frontends/controllers/ControlTabularCreate.C
index 970f5ffe6ccebfb1eda08ebded591022a107a950..e7bd1e430b44d6114a9694aa1b71c4a2279e4e84 100644 (file)
--- a/src/frontends/controllers/ControlTabularCreate.C
+++ b/src/frontends/controllers/ControlTabularCreate.C
@@ -5,35 +5,47 @@
  *
  * \author unknown
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "ControlTabularCreate.h"
 #include "funcrequest.h"
-#include "support/lstrings.h"
 
+#include "support/convert.h"
+
+
+using std::string;
+
+namespace lyx {
+namespace frontend {
 
 ControlTabularCreate::ControlTabularCreate(Dialog & parent)
        : Dialog::Controller(parent)
 {}
 
 
-void ControlTabularCreate::initialiseParams(string const &)
+bool ControlTabularCreate::initialiseParams(string const &)
 {
-       params_.first = params_.second = 5;
+       params_.first  = 5;
+       params_.second = 5;
+       return true;
 }
 
 
 void ControlTabularCreate::clearParams()
 {
-       params_.first = params_.second = 0;
+       params_.first  = 0;
+       params_.second = 0;
 }
 
 
 void ControlTabularCreate::dispatchParams()
 {
-       string data = tostr(params().first) + ' ' + tostr(params().second);
-       kernel().dispatch(FuncRequest(LFUN_TABULAR_INSERT, data));
+       string const data = convert<string>(params().first) + ' ' + convert<string>(params().second);
+       kernel().dispatch(FuncRequest(getLfun(), data));
 }
+
+} // namespace frontend
+} // namespace lyx