John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / lyxgluelength.C

diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C
index d876e7d3477dd61281963236a97d0802873f33d0..d5add58afc938c1ad35dc83346292689be38aee2 100644 (file)
--- a/src/lyxgluelength.C
+++ b/src/lyxgluelength.C
@@ -15,22 +15,10 @@
 #endif
 
 #include "lyxgluelength.h"
+#include "lengthcommon.h"
 
 #include "Lsstream.h"
 
-namespace {
-// this is now here and in lyxlenght.h
-
-int const num_units = LyXLength::UNIT_NONE;
-
-// I am not sure if "mu" should be possible to select (Lgb)
-char const * unit_name[num_units] = { "sp", "pt", "bp", "dd",
-                                     "mm", "pc", "cc", "cm",
-                                     "in", "ex", "em", "mu",
-                                     "%",  "c%", "p%", "l%" };
-
-}
-
 
 LyXGlueLength::LyXGlueLength(LyXLength const & len)
        : len_(len)
@@ -53,8 +41,8 @@ string const LyXGlueLength::asString() const
 {
        ostringstream buffer;
 
-       if (plus_.value() != 0.0)
-               if (minus_.value() != 0.0)
+       if (!plus_.zero())
+               if (!minus_.zero())
                        if (len_.unit() == plus_.unit() && len_.unit() == minus_.unit())
                                if (plus_.value() == minus_.value())
                                        buffer << len_.value() << "+-"
@@ -87,7 +75,7 @@ string const LyXGlueLength::asString() const
                                       << unit_name[plus_.unit()];
        
        else
-               if (minus_.value() != 0.0)
+               if (!minus_.zero())
                        if (len_.unit() == minus_.unit())
                                buffer << len_.value() << '-' << minus_.value()
                                       << unit_name[len_.unit()];
@@ -107,8 +95,8 @@ string const LyXGlueLength::asLatexString() const
 {
        ostringstream buffer;
 
-       if (plus_.value() != 0.0)
-               if (minus_.value() != 0.0)
+       if (!plus_.zero())
+               if (!minus_.zero())
                        buffer << len_.value() << unit_name[len_.unit()]
                               << " plus "
                               << plus_.value() << unit_name[plus_.unit()]
@@ -119,7 +107,7 @@ string const LyXGlueLength::asLatexString() const
                               << " plus "
                               << plus_.value() << unit_name[plus_.unit()];
        else
-               if (minus_.value() != 0.0)
+               if (!minus_.zero())
                        buffer << len_.value() << unit_name[len_.unit()]
                               << " minus "
                               << minus_.value() << unit_name[minus_.unit()];