Enable the external inset to handle unknown templates gracefully.

[lyx.git] / src / insets / insetwrap.C

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 62be16ee3676a6f51a8664f343f140cb6da70f78..864225d9c137bcec89a8bc8ca1f0adce09a9d202 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -75,22 +75,14 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
 }
 
 
-InsetWrap::InsetWrap(InsetWrap const & in, bool same_id)
-       : InsetCollapsable(in, same_id), params_(in.params_)
-{}
-
-
 InsetWrap::~InsetWrap()
 {
-       InsetWrapMailer mailer(*this);
-       mailer.hideDialog();
+       InsetWrapMailer(*this).hideDialog();
 }
 
 
 dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
 {
-       Inset::RESULT result = UNDISPATCHED;
-
        switch (cmd.action) {
        case LFUN_INSET_MODIFY: {
                InsetWrapParams params;
@@ -100,21 +92,16 @@ dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
                params_.width     = params.width;
 
                cmd.view()->updateInset(this);
-               result = DISPATCHED;
+               return DISPATCHED;
        }
-       break;
 
-       case LFUN_INSET_DIALOG_UPDATE: {
-               InsetWrapMailer mailer(*this);
-               mailer.updateDialog(cmd.view());
-       }
-       break;
+       case LFUN_INSET_DIALOG_UPDATE: 
+               InsetWrapMailer(*this).updateDialog(cmd.view());
+               return DISPATCHED;
 
        default:
-               result = InsetCollapsable::localDispatch(cmd);
+               return InsetCollapsable::localDispatch(cmd);
        }
-
-       return result;
 }
 
 
@@ -180,9 +167,9 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-Inset * InsetWrap::clone(Buffer const &, bool same_id) const
+Inset * InsetWrap::clone() const
 {
-       return new InsetWrap(*const_cast<InsetWrap *>(this), same_id);
+       return new InsetWrap(*this);
 }
 
 
@@ -192,8 +179,8 @@ string const InsetWrap::editMessage() const
 }
 
 
-int InsetWrap::latex(Buffer const * buf,
-                     ostream & os, bool fragile, bool fp) const
+int InsetWrap::latex(Buffer const * buf, ostream & os,
+                    LatexRunParams const & runparams) const
 {
        os << "\\begin{floating" << params_.type << '}';
        if (!params_.placement.empty()) {
@@ -201,7 +188,7 @@ int InsetWrap::latex(Buffer const * buf,
        }
        os  << '{' << params_.width.asLatexString() << "}%\n";
 
-       int const i = inset.latex(buf, os, fragile, fp);
+       int const i = inset.latex(buf, os, runparams);
 
        os << "\\end{floating" << params_.type << "}%\n";
        return i + 2;
@@ -261,8 +248,7 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 {
        if (!inset.showInsetDialog(bv)) {
                InsetWrap * tmp = const_cast<InsetWrap *>(this);
-               InsetWrapMailer mailer(*tmp);
-               mailer.showDialog(bv);
+               InsetWrapMailer(*tmp).showDialog(bv);
        }
        return true;
 }
@@ -307,7 +293,7 @@ void InsetWrapMailer::string2params(string const & in,
 
        if (in.empty())
                return;
-       
+
        istringstream data(STRCONV(in));
        LyXLex lex(0,0);
        lex.setStream(data);