Fix layout bug. Pasting text into a cell tried to set Standard layout, because

[lyx.git] / src / lengthcommon.cpp

diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp
index 191eca85ba0e7ee85df8e1dbee545ab69f953e2d..b29b692f6e7844c145d0d325b519d2c465695be3 100644 (file)
--- 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,7 +35,7 @@ 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 %"), "" };