prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 70325f65309be633a927fa705d4c337ed7633fdf..d88a94a8442c9da83726929fa39594f025efc99b 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -76,7 +76,7 @@ public:
        ///
        explicit InsetText(InsetText const &);
        ///
-       InsetBase * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        InsetText & operator=(InsetText const & it);
        /// empty inset to empty par, or just mark as erased
@@ -105,7 +105,7 @@ public:
        bool unlockInsetInInset(BufferView *,
                                UpdatableInset *, bool lr = false);
        ///
-       bool updateInsetInInset(BufferView *, Inset *);
+       bool updateInsetInInset(BufferView *, InsetOld *);
        ///
        RESULT localDispatch(FuncRequest const &);
        ///
@@ -114,13 +114,13 @@ public:
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const { return 0; }
+       int linuxdoc(Buffer const *, std::ostream &) const ;
        ///
        int docbook(Buffer const *, std::ostream &, bool mixcont) const ;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       Inset::Code lyxCode() const { return Inset::TEXT_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::TEXT_CODE; }
        /// FIXME, document
        void getCursorPos(BufferView *, int & x, int & y) const;
        /// Get the absolute document x,y of the cursor
@@ -130,20 +130,18 @@ public:
        ///
        void fitInsetCursor(BufferView *) const;
        ///
-       bool insertInset(BufferView *, Inset *);
+       bool insertInset(BufferView *, InsetOld *);
        ///
-       bool insetAllowed(Inset::Code) const;
+       bool insetAllowed(InsetOld::Code) const;
        ///
        UpdatableInset * getLockingInset() const;
        ///
-       UpdatableInset * getFirstLockingInsetOfType(Inset::Code);
+       UpdatableInset * getFirstLockingInsetOfType(InsetOld::Code);
        ///
        void setFont(BufferView *, LyXFont const &,
                     bool toggleall = false,
                     bool selectall = false);
        ///
-       int getMaxWidth(BufferView *, UpdatableInset const *) const;
-       ///
        void init(InsetText const * ins);
        ///
        void writeParagraphData(Buffer const *, std::ostream &) const;
@@ -187,7 +185,7 @@ public:
        ///
        void clearSelection(BufferView * bv);
        ///
-       Inset * getInsetFromID(int id) const;
+       InsetOld * getInsetFromID(int id) const;
        ///
        ParagraphList * getParagraphs(int) const;
        ///
@@ -298,9 +296,9 @@ private:
        ///
        void removeNewlines();
        ///
-       int cx(BufferView *) const;
+       int cx() const;
        ///
-       int cix(BufferView *) const;
+       int cix() const;
        ///
        int cy() const;
        ///