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

diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp
index 4b6a45a6ae..b29b692f6e 100644
--- a/src/lengthcommon.cpp
+++ b/src/lengthcommon.cpp
@@ -12,15 +12,15 @@
 
 #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
@@ -35,16 +35,16 @@ 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_("cc[[unit of measure]]"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
 	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);
 }