Fix crash when entering unhandled math objects in toolbar

[lyx.git] / src / Bullet.h

diff --git a/src/Bullet.h b/src/Bullet.h
index c4c8203f8bb423c61d4c7a8f618fd2234457da33..38fc29e4cbc85308cf248fe9da80ea0400066ff2 100644 (file)
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -47,21 +47,14 @@ public:
        ///
        int getSize() const;
        ///
-       string getText() const;
+       string const & getText() const;
        ///
-       string getText();
-       ///
-       char const * c_str() const;
-       ///
-       Bullet & operator = (Bullet const &);
+       Bullet & operator=(Bullet const &);
        ///
        friend bool operator==(Bullet const &, Bullet const &);
-       ///
-       friend bool operator!=(Bullet const & b1, Bullet const & b2) {
-               return !(b1 == b2);
-       }
 protected:
 #ifdef ENABLE_ASSERTIONS
+       ///
        void testInvariant() const {
                Assert(font >= MIN);
                Assert(font < FONTMAX);
@@ -106,18 +99,18 @@ private:
        };
        
        ///
-       void generateText();
+       void generateText() const;
        ///
-       static string bulletSize(short int);
+       static string const bulletSize(short int);
        ///
-       static string bulletEntry(short int, short int);
+       static string const bulletEntry(short int, short int);
        
        ///
-       short font;
+       int font;
        ///
-       short character;
+       int character;
        ///
-       short size;
+       int size;
        
        // size, character and font are array indices to access 
        // the predefined arrays of LaTeX equivalent strings.
@@ -126,7 +119,7 @@ private:
            or if I can use it to generate strings (0)
            or have already (-1)
        */
-       short user_text; 
+       mutable short user_text; 
        
        //NOTE: Arranging these four shorts above to be together
        //      like this should ensure they are in a single cache line
@@ -135,7 +128,7 @@ private:
            or one generated internally from the font, character
            and size settings.
        */
-       string text;
+       mutable string text;
 };
 
 
@@ -229,13 +222,6 @@ int Bullet::getSize() const
 }
 
 
-inline
-string Bullet::getText() const
-{
-       return text;
-}
-
-
 inline
 Bullet & Bullet::operator=(Bullet const & b)
 {
@@ -253,16 +239,15 @@ Bullet & Bullet::operator=(Bullet const & b)
        return *this;
 }
 
+/*-----------------End Bullet Member Functions-----------------*/
 
 inline
-char const * Bullet::c_str() const
+bool operator!=(Bullet const & b1, Bullet const & b2)
 {
-       return this->getText().c_str();
+       return !(b1 == b2);
 }
 
-
-/*-----------------End Bullet Member Functions-----------------*/
-
+///
 extern
 Bullet const ITEMIZE_DEFAULTS[];