prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 21b14a0867181938957a79450e52ea3f2bc8b4c0..fe2f618f0a8268088e29a4e27ab0c18bb797f8dd 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -34,7 +34,7 @@
 
 using std::ostream;
 using std::endl;
-
+using std::auto_ptr;
 
 namespace {
 
@@ -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
+auto_ptr<InsetBase> InsetWrap::clone() const
 {
-       return new InsetWrap(*const_cast<InsetWrap *>(this), same_id);
+       return auto_ptr<InsetBase>(new InsetWrap(*this));
 }
 
 
@@ -193,8 +180,7 @@ string const InsetWrap::editMessage() const
 
 
 int InsetWrap::latex(Buffer const * buf, ostream & os,
-                    LatexRunParams const & runparams,
-                    bool fp) const
+                    LatexRunParams const & runparams) const
 {
        os << "\\begin{floating" << params_.type << '}';
        if (!params_.placement.empty()) {
@@ -202,7 +188,7 @@ int InsetWrap::latex(Buffer const * buf, ostream & os,
        }
        os  << '{' << params_.width.asLatexString() << "}%\n";
 
-       int const i = inset.latex(buf, os, runparams, fp);
+       int const i = inset.latex(buf, os, runparams);
 
        os << "\\end{floating" << params_.type << "}%\n";
        return i + 2;
@@ -219,7 +205,7 @@ int InsetWrap::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 }
 
 
-bool InsetWrap::insetAllowed(Inset::Code code) const
+bool InsetWrap::insetAllowed(InsetOld::Code code) const
 {
        switch(code) {
        case FLOAT_CODE:
@@ -232,26 +218,6 @@ bool InsetWrap::insetAllowed(Inset::Code code) const
 }
 
 
-int InsetWrap::getMaxWidth(BufferView * bv, UpdatableInset const * inset)
-       const
-{
-       if (owner() &&
-           static_cast<UpdatableInset*>(owner())->getMaxWidth(bv, inset) < 0) {
-               return -1;
-       }
-       if (!params_.width.zero()) {
-               int const ww1 = latexTextWidth(bv);
-               int const ww2 = InsetCollapsable::getMaxWidth(bv, inset);
-               if (ww2 > 0 && ww2 < ww1) {
-                       return ww2;
-               }
-               return ww1;
-       }
-       // this should not happen!
-       return InsetCollapsable::getMaxWidth(bv, inset);
-}
-
-
 int InsetWrap::latexTextWidth(BufferView * bv) const
 {
        return params_.width.inPixels(InsetCollapsable::latexTextWidth(bv));
@@ -262,14 +228,13 @@ 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;
 }
 
 
-void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
+void InsetWrap::addToToc(lyx::toc::TocList & toclist, Buffer const * buf) const
 {
        // Now find the caption in the float...
        ParagraphList::iterator tmp = inset.paragraphs.begin();
@@ -281,7 +246,7 @@ void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
                        string const str =
                                tostr(toclist[name].size() + 1)
                                + ". " + tmp->asString(buf, false);
-                       toc::TocItem const item(tmp->id(), 0 , str);
+                       lyx::toc::TocItem const item(tmp->id(), 0 , str);
                        toclist[name].push_back(item);
                }
        }
@@ -295,7 +260,7 @@ InsetWrapMailer::InsetWrapMailer(InsetWrap & inset)
 {}
 
 
-string const InsetWrapMailer::inset2string() const
+string const InsetWrapMailer::inset2string(Buffer const &) const
 {
        return params2string(inset_.params());
 }
@@ -308,7 +273,7 @@ void InsetWrapMailer::string2params(string const & in,
 
        if (in.empty())
                return;
-       
+
        istringstream data(STRCONV(in));
        LyXLex lex(0,0);
        lex.setStream(data);