Some more cleanup of LyXView:

[lyx.git] / src / lengthcommon.cpp

diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp
index 4b6a45a6ae1a1630e5908f4b1f4a621b364b4767..e783555733f329e0d1cdf535b13c0e8a964a2e52 100644 (file)
--- a/src/lengthcommon.cpp
+++ b/src/lengthcommon.cpp
@@ -12,10 +12,10 @@
 
 #include <config.h>
 
-#include "lengthcommon.h"
-
 #include "gettext.h"
+#include "Length.h"
 
+#include <string>
 
 namespace lyx {
 
@@ -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);
 }