X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flengthcommon.C;h=fc1ea7017c7aa611fff4d6e74c560f0b60d3852f;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=887302296de82b03238362a48eb46d5433fd198c;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/lengthcommon.C b/src/lengthcommon.C
index 887302296d..fc1ea7017c 100644
--- 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] = {
+char const * const unit_name[] = {
 	"sp", "pt", "bp", "dd", "mm", "pc",
 	"cc", "cm", "in", "ex", "em", "mu",
 	"text%",  "col%", "page%", "line%",
-	"theight%", "pheight%" };
+	"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] = {
+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
@@ -41,14 +40,14 @@ char const * unit_name_ltx[num_units] = {
 //	"textheight",  "columnwidth", "pagewidth", "linewidth",
 //	"textheight", "pageheight" };
 	"text%",  "col%", "page%", "line%",
-	"theight%", "pheight%" };
+	"theight%", "pheight%", "" };
 
 // the LyX gui units
-char const * unit_name_gui[num_units] = {
+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%"),
-	N_("theight%"), N_("pheight%") };
+	N_("theight%"), N_("pheight%"), "" };
 
 	// this one maybe better ???? but there can be problems with
 	// xforms (Herbert)