prevent crash when inserting minipage in table cell,

[lyx.git] / src / lyxlength.h

diff --git a/src/lyxlength.h b/src/lyxlength.h
index 1d84408fbce3a65a297925d224c87ec36ec48394..d64c93fbbc438f9caf08fd0444b3fc6a90c301df 100644 (file)
--- a/src/lyxlength.h
+++ b/src/lyxlength.h
@@ -11,10 +11,6 @@
 #ifndef LYX_LENGTH_H
 #define LYX_LENGTH_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "LString.h"
 
 /**
@@ -36,12 +32,12 @@ public:
                EX, ///< Height of a small "x" for the current font.
                EM, ///< Width of capital "M" in current font.
                MU, ///< Math unit (18mu = 1em) for positioning in math mode
-               PW, ///< Percent of columnwidth
-               PE, ///< Percent of textwidth
-               PP, ///< Percent of pagewidth
-               PL, ///< Percent of linewidth
-               TH, ///< Percent of textheight          // Herbert 2002-05-16
-               PH, ///< Percent of paperheight         // Herbert 2002-05-16
+               PTW, //< Percent of TextWidth
+               PCW, //< Percent of ColumnWidth
+               PPW, //< Percent of PageWidth
+               PLW, //< Percent of LineWidth
+               PTH, //< Percent of TextHeight          // Herbert 2002-05-16
+               PPH, //< Percent of PaperHeight         // Herbert 2002-05-16
                UNIT_NONE ///< no unit
        };
 
@@ -63,18 +59,18 @@ public:
        void unit(LyXLength::UNIT unit);
        ///
        bool zero() const;
+       ///
+       bool empty() const;
        /// return string representation
        string const asString() const;
        /// return string representation for LaTeX
        string const asLatexString() const;
        /// return the on-screen size of this length
-       int inPixels(int default_width, int default_height) const;
+       int inPixels(int text_width, int em_width = 0) const;
        /// return the on-screen size of this length of an image
        int inBP() const;
 
-       /** If "data" is valid, the length represented by it is
-         stored into "result", if that is not 0. */
-       friend bool isValidLength(string const & data, LyXLength * result = 0);
+       friend bool isValidLength(string const & data, LyXLength * result);
 
 private:
        ///
@@ -87,8 +83,9 @@ private:
 bool operator==(LyXLength const & l1, LyXLength const & l2);
 ///
 bool operator!=(LyXLength const & l1, LyXLength const & l2);
-///
-bool isValidLength(string const & data, LyXLength * result);
+/** If "data" is valid, the length represented by it is
+    stored into "result", if that is not 0. */
+bool isValidLength(string const & data, LyXLength * result = 0);
 /// return the name of the given unit number
 char const * stringFromUnit(int unit);