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 25af09fc28e4fa870c93dcf509c2d5d9a8bdbd9b..3e2cc24314d486945e774ec83e87cdd178820fad 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -206,12 +206,12 @@ public:
        virtual void cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const;
 
-       ///
-       virtual bool isFreeSpacing() const { return false; }
-       ///
-       virtual bool allowEmpty() const { return false; }
+       /// Allow multiple blanks
+       virtual bool isFreeSpacing() const;
+       /// Don't eliminate empty paragraphs
+       virtual bool allowEmpty() const;
        /// Force inset into LTR environment if surroundings are RTL?
-       virtual bool forceLTR() const { return false; }
+       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;
@@ -295,11 +295,11 @@ public:
        virtual int plaintext(odocstream &, OutputParams const &) const = 0;
        /// docbook output
        virtual int docbook(odocstream & os, OutputParams const &) const;
+       /// LyX HTML output
+       virtual docstring xhtml(odocstream & os, OutputParams const &) const;
        /// 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;
@@ -383,7 +383,9 @@ public:
        ///
        virtual docstring name() const;
        ///
-       virtual InsetLayout const & getLayout(BufferParams const & bp) 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
@@ -468,6 +470,8 @@ public:
        enum mode_type {UNDECIDED_MODE, TEXT_MODE, MATH_MODE};
        /// return text or mathmode if that is possible to determine
        virtual mode_type currentMode() const { return UNDECIDED_MODE; }
+       /// returns whether changing mode during latex export is forbidden
+       virtual bool lockedMode() const { return false; }
        /// returns whether this inset is allowed in other insets of given mode
        virtual bool allowedIn(mode_type) const { return true; }
        /**
@@ -494,6 +498,8 @@ public:
        ///
        virtual ColorCode backgroundColor() const;
        ///
+       virtual ColorCode labelColor() const;
+       ///
        enum CollapseStatus {
                Collapsed,
                Open