gettext support, fast_start option, scons all, mingw bug fix and some cleanup for...

[lyx.git] / src / lengthcommon.C

diff --git a/src/lengthcommon.C b/src/lengthcommon.C
index c8e89ed5a5b75b666d77611281c53e45ca9faa70..fc1ea7017c7aa611fff4d6e74c560f0b60d3852f 100644 (file)
--- a/src/lengthcommon.C
+++ b/src/lengthcommon.C
@@ -18,22 +18,21 @@
 
 using std::string;
 
-
-int const num_units = LyXLength::UNIT_NONE;
-
 // I am not sure if "mu" should be possible to select (Lgb)
 
 // unit_name is for compatibility. Can be deleted when all works well.
 // means, when we have full language support for the lengths
 // in all gui's                                (Herbert 2002-11-01)
-char const * unit_name[num_units + 1] = {
+char const * const unit_name[] = {
        "sp", "pt", "bp", "dd", "mm", "pc",
        "cc", "cm", "in", "ex", "em", "mu",
        "text%",  "col%", "page%", "line%",
        "theight%", "pheight%", "" };
 
+int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
+
 // the latex units
-char const * unit_name_ltx[num_units + 1] = {
+char const * const unit_name_ltx[] = {
        "sp", "pt", "bp", "dd", "mm", "pc",
        "cc", "cm", "in", "ex", "em", "mu",
        // in 1.4 the following names should be used. then no
@@ -44,7 +43,7 @@ char const * unit_name_ltx[num_units + 1] = {
        "theight%", "pheight%", "" };
 
 // the LyX gui units
-char const * unit_name_gui[num_units + 1] = {
+char const * const unit_name_gui[] = {
        N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"),
        N_("cc"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
        N_("text%"), N_("col%"), N_("page%"), N_("line%"),