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 a5ffa5a7ba3fd42c60608982353f93a22d8778fd..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)
-       : InsetCollapsable(in), 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;
 }
 
 
@@ -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;
 }