X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flengthcommon.cpp;h=0fa43359d66766e7078e2818cc78e085498af7a3;hb=73b81b79868dbee9ee0277045e8a672a615040fd;hp=4b6a45a6ae1a1630e5908f4b1f4a621b364b4767;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git

diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp
index 4b6a45a6ae..0fa43359d6 100644
--- a/src/lengthcommon.cpp
+++ b/src/lengthcommon.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Matthias Ettrich
  * \author John Levon
  *
@@ -12,21 +12,21 @@
 
 #include <config.h>
 
-#include "lengthcommon.h"
+#include "support/gettext.h"
+#include "Length.h"
 
-#include "gettext.h"
+#include <string>
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-
 // I am not sure if "mu" should be possible to select (Lgb)
 
 // the latex units
 char const * const unit_name[] = {
-	"sp", "pt", "bp", "dd", "mm", "pc",
-	"cc", "cm", "in", "ex", "em", "mu",
+	"bp", "cc", "cm", "dd", "em", "ex", "in", "mm", "mu",
+	"pc", "pt", "sp",
 	"text%",  "col%", "page%", "line%",
 	"theight%", "pheight%", "" };
 
@@ -34,17 +34,18 @@ int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
 
 // the LyX gui 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 Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
+	N_("bp"), N_("cc[[unit of measure]]"), N_("cm"), N_("dd"), N_("em"),
+	N_("ex"), N_("in[[unit of measure]]"), N_("mm"), N_("mu[[unit of measure]]"), N_("pc"),
+	N_("pt"), N_("sp"), N_("Text Width %"),
+	N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
 	N_("Text Height %"), N_("Page Height %"), "" };
 
-LyXLength::UNIT unitFromString(string const & data)
+Length::UNIT unitFromString(string const & data)
 {
 	int i = 0;
 	while (i < num_units && data != unit_name[i])
 		++i;
-	return static_cast<LyXLength::UNIT>(i);
+	return static_cast<Length::UNIT>(i);
 }