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 2e0140ba28722900a811bc05162d25a1a42b238c..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 {
 
@@ -95,7 +95,7 @@ dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
                return DISPATCHED;
        }
 
-       case LFUN_INSET_DIALOG_UPDATE: 
+       case LFUN_INSET_DIALOG_UPDATE:
                InsetWrapMailer(*this).updateDialog(cmd.view());
                return DISPATCHED;
 
@@ -167,9 +167,9 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-InsetBase * InsetWrap::clone() const
+auto_ptr<InsetBase> InsetWrap::clone() const
 {
-       return new InsetWrap(*this);
+       return auto_ptr<InsetBase>(new InsetWrap(*this));
 }
 
 
@@ -205,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:
@@ -218,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));
@@ -254,7 +234,7 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 }
 
 
-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();
@@ -266,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);
                }
        }
@@ -280,7 +260,7 @@ InsetWrapMailer::InsetWrapMailer(InsetWrap & inset)
 {}
 
 
-string const InsetWrapMailer::inset2string() const
+string const InsetWrapMailer::inset2string(Buffer const &) const
 {
        return params2string(inset_.params());
 }