fix crash due to invalidated iterator

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

diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C
index 9c6a251b14f9d1079bbdf38ad59ab1b9e32d2a40..556363ac50d1a6600b24391bb57a8275e2e4e98e 100644 (file)
--- a/src/frontends/controllers/ControlExternal.C
+++ b/src/frontends/controllers/ControlExternal.C
@@ -29,7 +29,7 @@
 
 #include "support/filefilterlist.h"
 #include "support/filetools.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 using std::advance;
 using std::vector;
@@ -69,7 +69,7 @@ void ControlExternal::dispatchParams()
        string const lfun = InsetExternalMailer::params2string(params(),
                                                               kernel().buffer());
 
-       kernel().dispatch(FuncRequest(LFUN_INSET_APPLY, lfun));
+       kernel().dispatch(FuncRequest(getLfun(), lfun));
 }
 
 
@@ -189,7 +189,7 @@ string const ControlExternal::readBB(string const & file)
                }
        }
 
-       return ("0 0 " + tostr(width) + ' ' + tostr(height));
+       return ("0 0 " + convert<string>(width) + ' ' + convert<string>(height));
 }
 
 } // namespace frontend
@@ -239,7 +239,7 @@ vector<RotationDataType> const & all_origins()
 
 string const origin_gui_str(size_type i)
 {
-       return origin_gui_strs[i];
+       return _(origin_gui_strs[i]);
 }
 
 } // namespace external