prevent crash when inserting minipage in table cell,

[lyx.git] / src / Bullet.h

diff --git a/src/Bullet.h b/src/Bullet.h
index cc955085709179977e34d24cbf7ff3599450ca4c..5d192283c1ac09b2d35a4435e5babb5e44234aed 100644 (file)
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 /* This is the bullet class definition file.
  * This file is part of
 // -*- C++ -*-
 /* This is the bullet class definition file.
  * This file is part of

- * ====================================================== 
+ * ======================================================

  *
  *           LyX, The Document Processor
  *
  *
  *           LyX, The Document Processor
  *


@@ -15,10 +15,6 @@
 #ifndef BULLET_H
 #define BULLET_H
 
 #ifndef BULLET_H
 #define BULLET_H
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "LString.h"
 
 ///
 #include "LString.h"
 
 ///


@@ -60,7 +56,7 @@ private:
           This enum makes adding additional panels or changing panel sizes
           easier. Since you only need change these values for all tests to
           be correct for the new values.
           This enum makes adding additional panels or changing panel sizes
           easier. Since you only need change these values for all tests to
           be correct for the new values.

-          
+

           Note: MAX means the size of the array so to test you need:
           (x < MAX)  *not* (x <= MAX)
        */
           Note: MAX means the size of the array so to test you need:
           (x < MAX)  *not* (x <= MAX)
        */


@@ -74,33 +70,33 @@ private:
                ///
                SIZEMAX = 10
        };
                ///
                SIZEMAX = 10
        };

-       
+

        ///
        void generateText() const;
        ///
        static string const bulletSize(int);
        ///
        static string const bulletEntry(int, int);
        ///
        void generateText() const;
        ///
        static string const bulletSize(int);
        ///
        static string const bulletEntry(int, int);

-       
+

        ///
        int font;
        ///
        int character;
        ///
        int size;
        ///
        int font;
        ///
        int character;
        ///
        int size;

-       
-       // size, character and font are array indices to access 
+
+       // size, character and font are array indices to access

        // the predefined arrays of LaTeX equivalent strings.
        // the predefined arrays of LaTeX equivalent strings.

-       
+

        /** flag indicates if user has control of text (1)
            or if I can use it to generate strings (0)
            or have already (-1)
        */
        /** flag indicates if user has control of text (1)
            or if I can use it to generate strings (0)
            or have already (-1)
        */

-       mutable 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
        //NOTE: Arranging these four shorts above to be together
        //      like this should ensure they are in a single cache line

-       
+

        /** text may contain a user-defined LaTeX symbol command
            or one generated internally from the font, character
            and size settings.
        /** text may contain a user-defined LaTeX symbol command
            or one generated internally from the font, character
            and size settings.