prevent crash when inserting minipage in table cell,

[lyx.git] / src / insets / insetfloat.h

diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index 8b02904acdc07f20a3259d283191601fa99d1114..9e48dbb7cc11208349804d2ce07c8b7da95986a9 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -43,8 +43,6 @@ public:
        ///
        InsetFloat(InsetFloat const &);
        ///
-       //InsetFloat(InsetFloat const &, bool same_id);
-       ///
        ~InsetFloat();
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
@@ -55,20 +53,20 @@ public:
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       Inset * clone(Buffer const &) const;
-       ///
-       //Inset * clone(Buffer const &, bool same_id) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       Inset::Code lyxCode() const { return Inset::FLOAT_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::FLOAT_CODE; }
        ///
        int latex(Buffer const *, std::ostream &,
                  LatexRunParams const &) const;
        ///
+       int linuxdoc(Buffer const *, std::ostream &) const;
+       ///
        int docbook(Buffer const *, std::ostream &, bool mixcont) const;
        ///
        string const editMessage() const;
        ///
-       bool insetAllowed(Inset::Code) const;
+       bool insetAllowed(InsetOld::Code) const;
        /** returns true if, when outputing LaTeX, font changes should
            be closed before generating this inset. This is needed for
            insets that may contain several paragraphs */
@@ -76,7 +74,7 @@ public:
        ///
        void wide(bool w, BufferParams const &);
        ///
-       void addToToc(toc::TocList &, Buffer const *) const;
+       void addToToc(lyx::toc::TocList &, Buffer const *) const;
        ///
        bool  showInsetDialog(BufferView *) const;
        ///
@@ -100,7 +98,7 @@ public:
        ///
        virtual string const & name() const { return name_; }
        ///
-       virtual string const inset2string() const;
+       virtual string const inset2string(Buffer const &) const;
        ///
        static void string2params(string const &, InsetFloatParams &);
        ///