X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flengthcommon.C;h=dde8d54c169c5440bd11972b6683fa774217f08b;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=c8e89ed5a5b75b666d77611281c53e45ca9faa70;hpb=173be73b2737e1f3e45f7989bf031f4c57d9b581;p=lyx.git

diff --git a/src/lengthcommon.C b/src/lengthcommon.C
index c8e89ed5a5..dde8d54c16 100644
--- a/src/lengthcommon.C
+++ b/src/lengthcommon.C
@@ -16,48 +16,28 @@
 
 #include "gettext.h"
 
-using std::string;
 
+namespace lyx {
 
-int const num_units = LyXLength::UNIT_NONE;
+using std::string;
 
 // 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] = {
-	"sp", "pt", "bp", "dd", "mm", "pc",
-	"cc", "cm", "in", "ex", "em", "mu",
-	"text%",  "col%", "page%", "line%",
-	"theight%", "pheight%", "" };
-
 // the latex units
-char const * unit_name_ltx[num_units + 1] = {
+char const * const unit_name[] = {
 	"sp", "pt", "bp", "dd", "mm", "pc",
 	"cc", "cm", "in", "ex", "em", "mu",
-	// in 1.4 the following names should be used. then no
-	// translation into the latex ones are needed
-//	"textheight",  "columnwidth", "pagewidth", "linewidth",
-//	"textheight", "pageheight" };
 	"text%",  "col%", "page%", "line%",
 	"theight%", "pheight%", "" };
 
+int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
+
 // 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%"),
-	N_("theight%"), N_("pheight%"), "" };
-
-	// this one maybe better ???? but there can be problems with
-	// xforms (Herbert)
-//	N_("textwidth%"), N_("columnwidth%"), N_("pagewidth%"), N_("linewidth%"),
-//	N_("textheight%"), N_("pageheight%") };
-
-	// or altenative this ones
-//	N_("twidth%"), N_("cwidth%"), N_("pwidth%"), N_("lwidth%"),
-//	N_("theight%"), N_("pheight%") };
+	N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
+	N_("Text Height %"), N_("Page Height %"), "" };
 
 LyXLength::UNIT unitFromString(string const & data)
 {
@@ -66,3 +46,6 @@ LyXLength::UNIT unitFromString(string const & data)
 		++i;
 	return static_cast<LyXLength::UNIT>(i);
 }
+
+
+} // namespace lyx