revert r30531, which causes a crash when copying an inset.

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

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index b130f6d8d5f5681a8f442909ec8e943685b60811..3e2cc24314d486945e774ec83e87cdd178820fad 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -27,6 +27,7 @@ namespace lyx {
 
 class BiblioInfo;
 class Buffer;
+class BufferParams;
 class BufferView;
 class Change;
 class CompletionList;
@@ -206,11 +207,11 @@ public:
                CursorSlice const & sl, bool boundary, int & x, int & y) const;
 
        /// Allow multiple blanks
-       virtual bool isFreeSpacing() const { return getLayout().isFreeSpacing(); }
+       virtual bool isFreeSpacing() const;
        /// Don't eliminate empty paragraphs
-       virtual bool allowEmpty() const { return getLayout().isKeepEmpty(); }
+       virtual bool allowEmpty() const;
        /// Force inset into LTR environment if surroundings are RTL?
-       virtual bool forceLTR() const { return getLayout().isForceLtr(); }
+       virtual bool forceLTR() const;
 
        /// Where should we go when we press the up or down cursor key?
        virtual bool idxUpDown(Cursor & cur, bool up) const;
@@ -299,8 +300,6 @@ public:
        /// the string that is passed to the TOC
        virtual void tocString(odocstream &) const {}
 
-       /// what appears in the minibuffer when opening
-       virtual docstring editMessage() const;
        /// can the contents of the inset be edited on screen ?
        // true for InsetCollapsables (not ButtonOnly) (not InsetInfo), InsetText
        virtual bool editable() const;
@@ -385,6 +384,8 @@ public:
        virtual docstring name() const;
        ///
        virtual InsetLayout const & getLayout() const;
+       /// Is this inset's layout defined in the document's textclass?
+       bool undefined() const;
        /// used to toggle insets
        /// is the inset open?
        /// should this inset be handled like a normal charater
@@ -486,9 +487,9 @@ public:
        /// set the change for the entire inset
        virtual void setChange(Change const &) {}
        /// accept the changes within the inset
-       virtual void acceptChanges() {};
+       virtual void acceptChanges(BufferParams const &) {};
        /// reject the changes within the inset
-       virtual void rejectChanges() {};
+       virtual void rejectChanges(BufferParams const &) {};
 
        ///
        virtual Dimension const dimension(BufferView const &) const;